1 diff -up boost_1_54_0/boost/numeric/ublas/detail/matrix_assign.hpp~ boost_1_54_0/boost/numeric/ublas/detail/matrix_assign.hpp
2 --- boost_1_54_0/boost/numeric/ublas/detail/matrix_assign.hpp~ 2010-10-19 00:01:35.000000000 -0700
3 +++ boost_1_54_0/boost/numeric/ublas/detail/matrix_assign.hpp 2013-07-22 04:33:26.399038120 -0700
4 @@ -1303,7 +1303,6 @@ namespace detail {
5 void matrix_swap (M &m, matrix_expression<E> &e, packed_proxy_tag, row_major_tag) {
6 typedef F<typename M::iterator2::reference, typename E::reference> functor_type;
7 // R unnecessary, make_conformant not required
8 - typedef typename M::size_type size_type;
9 typedef typename M::difference_type difference_type;
10 typename M::iterator1 it1 (m.begin1 ());
11 typename E::iterator1 it1e (e ().begin1 ());
12 @@ -1329,7 +1328,6 @@ namespace detail {
13 void matrix_swap (M &m, matrix_expression<E> &e, packed_proxy_tag, column_major_tag) {
14 typedef F<typename M::iterator1::reference, typename E::reference> functor_type;
15 // R unnecessary, make_conformant not required
16 - typedef typename M::size_type size_type;
17 typedef typename M::difference_type difference_type;
18 typename M::iterator2 it2 (m.begin2 ());
19 typename E::iterator2 it2e (e ().begin2 ());
20 @@ -1357,7 +1355,6 @@ namespace detail {
21 typedef R conformant_restrict_type;
22 typedef typename M::size_type size_type;
23 typedef typename M::difference_type difference_type;
24 - typedef typename M::value_type value_type;
25 BOOST_UBLAS_CHECK (m.size1 () == e ().size1 (), bad_size ());
26 BOOST_UBLAS_CHECK (m.size2 () == e ().size2 (), bad_size ());
28 @@ -1482,7 +1479,6 @@ namespace detail {
29 typedef R conformant_restrict_type;
30 typedef typename M::size_type size_type;
31 typedef typename M::difference_type difference_type;
32 - typedef typename M::value_type value_type;
33 BOOST_UBLAS_CHECK (m.size1 () == e ().size1 (), bad_size ());
34 BOOST_UBLAS_CHECK (m.size2 () == e ().size2 (), bad_size ());
36 diff -up boost_1_54_0/boost/numeric/ublas/detail/vector_assign.hpp~ boost_1_54_0/boost/numeric/ublas/detail/vector_assign.hpp
37 --- boost_1_54_0/boost/numeric/ublas/detail/vector_assign.hpp~ 2007-11-25 10:07:19.000000000 -0800
38 +++ boost_1_54_0/boost/numeric/ublas/detail/vector_assign.hpp 2013-07-22 04:32:21.774650296 -0700
39 @@ -379,7 +379,6 @@ namespace detail {
40 typedef typename V::size_type size_type;
41 typedef typename V::difference_type difference_type;
42 typedef typename V::value_type value_type;
43 - typedef typename V::reference reference;
44 #if BOOST_UBLAS_TYPE_CHECK
45 vector<value_type> cv (v.size ());
46 indexing_vector_assign<scalar_assign> (cv, v);
47 @@ -513,7 +512,6 @@ namespace detail {
48 typedef F<typename V::iterator::reference, typename E::iterator::reference> functor_type;
49 typedef typename V::size_type size_type;
50 typedef typename V::difference_type difference_type;
51 - typedef typename V::value_type value_type;
53 detail::make_conformant (v, e);
54 // FIXME should be a seperate restriction for E
55 diff -up boost_1_54_0/boost/numeric/ublas/lu.hpp~ boost_1_54_0/boost/numeric/ublas/lu.hpp
56 --- boost_1_54_0/boost/numeric/ublas/lu.hpp~ 2010-07-04 23:06:24.000000000 -0700
57 +++ boost_1_54_0/boost/numeric/ublas/lu.hpp 2013-07-22 04:40:06.634440205 -0700
58 @@ -63,7 +63,6 @@ namespace boost { namespace numeric { na
60 void swap_rows (const PM &pm, MV &mv, vector_tag) {
61 typedef typename PM::size_type size_type;
62 - typedef typename MV::value_type value_type;
64 size_type size = pm.size ();
65 for (size_type i = 0; i < size; ++ i) {
66 @@ -75,7 +74,6 @@ namespace boost { namespace numeric { na
68 void swap_rows (const PM &pm, MV &mv, matrix_tag) {
69 typedef typename PM::size_type size_type;
70 - typedef typename MV::value_type value_type;
72 size_type size = pm.size ();
73 for (size_type i = 0; i < size; ++ i) {
74 diff -up boost_1_54_0/boost/numeric/ublas/operation.hpp~ boost_1_54_0/boost/numeric/ublas/operation.hpp
75 --- boost_1_54_0/boost/numeric/ublas/operation.hpp~ 2007-11-25 10:07:19.000000000 -0800
76 +++ boost_1_54_0/boost/numeric/ublas/operation.hpp 2013-07-22 04:42:19.436046788 -0700
77 @@ -129,7 +129,6 @@ namespace boost { namespace numeric { na
78 const vector_expression<E2> &e2,
79 V &v, packed_random_access_iterator_tag, row_major_tag) {
80 typedef const E1 expression1_type;
81 - typedef const E2 expression2_type;
82 typedef typename V::size_type size_type;
84 typename expression1_type::const_iterator1 it1 (e1 ().begin1 ());
85 @@ -159,7 +158,6 @@ namespace boost { namespace numeric { na
86 const vector_expression<E2> &e2,
87 V &v, packed_random_access_iterator_tag, column_major_tag) {
88 typedef const E1 expression1_type;
89 - typedef const E2 expression2_type;
90 typedef typename V::size_type size_type;
92 typename expression1_type::const_iterator2 it2 (e1 ().begin2 ());
93 @@ -188,9 +186,7 @@ namespace boost { namespace numeric { na
94 axpy_prod (const matrix_expression<E1> &e1,
95 const vector_expression<E2> &e2,
96 V &v, sparse_bidirectional_iterator_tag) {
97 - typedef const E1 expression1_type;
98 typedef const E2 expression2_type;
99 - typedef typename V::size_type size_type;
101 typename expression2_type::const_iterator it (e2 ().begin ());
102 typename expression2_type::const_iterator it_end (e2 ().end ());
103 @@ -350,7 +346,6 @@ namespace boost { namespace numeric { na
104 axpy_prod (const vector_expression<E1> &e1,
105 const matrix_expression<E2> &e2,
106 V &v, packed_random_access_iterator_tag, column_major_tag) {
107 - typedef const E1 expression1_type;
108 typedef const E2 expression2_type;
109 typedef typename V::size_type size_type;
111 @@ -380,7 +375,6 @@ namespace boost { namespace numeric { na
112 axpy_prod (const vector_expression<E1> &e1,
113 const matrix_expression<E2> &e2,
114 V &v, packed_random_access_iterator_tag, row_major_tag) {
115 - typedef const E1 expression1_type;
116 typedef const E2 expression2_type;
117 typedef typename V::size_type size_type;
119 @@ -411,8 +405,6 @@ namespace boost { namespace numeric { na
120 const matrix_expression<E2> &e2,
121 V &v, sparse_bidirectional_iterator_tag) {
122 typedef const E1 expression1_type;
123 - typedef const E2 expression2_type;
124 - typedef typename V::size_type size_type;
126 typename expression1_type::const_iterator it (e1 ().begin ());
127 typename expression1_type::const_iterator it_end (e1 ().end ());
128 @@ -501,9 +493,6 @@ namespace boost { namespace numeric { na
129 const matrix_expression<E2> &e2,
131 dense_proxy_tag, row_major_tag) {
132 - typedef M matrix_type;
133 - typedef const E1 expression1_type;
134 - typedef const E2 expression2_type;
135 typedef typename M::size_type size_type;
136 typedef typename M::value_type value_type;
138 @@ -530,11 +519,9 @@ namespace boost { namespace numeric { na
139 const matrix_expression<E2> &e2,
141 sparse_proxy_tag, row_major_tag) {
142 - typedef M matrix_type;
143 typedef TRI triangular_restriction;
144 typedef const E1 expression1_type;
145 typedef const E2 expression2_type;
146 - typedef typename M::size_type size_type;
147 typedef typename M::value_type value_type;
149 #if BOOST_UBLAS_TYPE_CHECK
150 @@ -580,9 +567,6 @@ namespace boost { namespace numeric { na
151 const matrix_expression<E2> &e2,
153 dense_proxy_tag, column_major_tag) {
154 - typedef M matrix_type;
155 - typedef const E1 expression1_type;
156 - typedef const E2 expression2_type;
157 typedef typename M::size_type size_type;
158 typedef typename M::value_type value_type;
160 @@ -609,11 +593,9 @@ namespace boost { namespace numeric { na
161 const matrix_expression<E2> &e2,
163 sparse_proxy_tag, column_major_tag) {
164 - typedef M matrix_type;
165 typedef TRI triangular_restriction;
166 typedef const E1 expression1_type;
167 typedef const E2 expression2_type;
168 - typedef typename M::size_type size_type;
169 typedef typename M::value_type value_type;
171 #if BOOST_UBLAS_TYPE_CHECK
172 @@ -738,9 +720,6 @@ namespace boost { namespace numeric { na
173 const matrix_expression<E2> &e2,
175 dense_proxy_tag, row_major_tag) {
176 - typedef M matrix_type;
177 - typedef const E1 expression1_type;
178 - typedef const E2 expression2_type;
179 typedef typename M::size_type size_type;
180 typedef typename M::value_type value_type;
182 @@ -769,9 +748,6 @@ namespace boost { namespace numeric { na
183 const matrix_expression<E2> &e2,
185 dense_proxy_tag, column_major_tag) {
186 - typedef M matrix_type;
187 - typedef const E1 expression1_type;
188 - typedef const E2 expression2_type;
189 typedef typename M::size_type size_type;
190 typedef typename M::value_type value_type;
192 diff -up boost_1_54_0/boost/numeric/ublas/triangular.hpp~ boost_1_54_0/boost/numeric/ublas/triangular.hpp
193 --- boost_1_54_0/boost/numeric/ublas/triangular.hpp~ 2012-09-18 14:07:07.000000000 -0700
194 +++ boost_1_54_0/boost/numeric/ublas/triangular.hpp 2013-07-22 04:39:31.667230329 -0700
195 @@ -1859,7 +1859,6 @@ namespace boost { namespace numeric { na
196 void inplace_solve (const matrix_expression<E1> &e1, vector_expression<E2> &e2,
197 lower_tag, column_major_tag, dense_proxy_tag) {
198 typedef typename E2::size_type size_type;
199 - typedef typename E2::difference_type difference_type;
200 typedef typename E2::value_type value_type;
202 BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ());
203 @@ -1914,7 +1913,6 @@ namespace boost { namespace numeric { na
204 void inplace_solve (const matrix_expression<E1> &e1, vector_expression<E2> &e2,
205 lower_tag, column_major_tag, unknown_storage_tag) {
206 typedef typename E2::size_type size_type;
207 - typedef typename E2::difference_type difference_type;
208 typedef typename E2::value_type value_type;
210 BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ());
211 @@ -1943,7 +1941,6 @@ namespace boost { namespace numeric { na
212 void inplace_solve (const matrix_expression<E1> &e1, vector_expression<E2> &e2,
213 lower_tag, row_major_tag, dense_proxy_tag) {
214 typedef typename E2::size_type size_type;
215 - typedef typename E2::difference_type difference_type;
216 typedef typename E2::value_type value_type;
218 BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ());
219 @@ -1969,7 +1966,6 @@ namespace boost { namespace numeric { na
220 void inplace_solve (const matrix_expression<E1> &e1, vector_expression<E2> &e2,
221 lower_tag, row_major_tag, packed_proxy_tag) {
222 typedef typename E2::size_type size_type;
223 - typedef typename E2::difference_type difference_type;
224 typedef typename E2::value_type value_type;
226 BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ());
227 @@ -1998,7 +1994,6 @@ namespace boost { namespace numeric { na
228 void inplace_solve (const matrix_expression<E1> &e1, vector_expression<E2> &e2,
229 lower_tag, row_major_tag, unknown_storage_tag) {
230 typedef typename E2::size_type size_type;
231 - typedef typename E2::difference_type difference_type;
232 typedef typename E2::value_type value_type;
234 BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ());
235 @@ -2374,7 +2369,6 @@ namespace boost { namespace numeric { na
236 void inplace_solve (const matrix_expression<E1> &e1, matrix_expression<E2> &e2,
237 lower_tag, dense_proxy_tag) {
238 typedef typename E2::size_type size_type;
239 - typedef typename E2::difference_type difference_type;
240 typedef typename E2::value_type value_type;
242 BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ());
243 @@ -2435,7 +2429,6 @@ namespace boost { namespace numeric { na
244 void inplace_solve (const matrix_expression<E1> &e1, matrix_expression<E2> &e2,
245 lower_tag, unknown_storage_tag) {
246 typedef typename E2::size_type size_type;
247 - typedef typename E2::difference_type difference_type;
248 typedef typename E2::value_type value_type;
250 BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ());