mirror of
https://github.com/boostorg/multi_array.git
synced 2025-05-12 05:41:37 +00:00
Corrected some warnings/errors. Mostly missing 'typename' keywords.
[SVN r14574]
This commit is contained in:
parent
501c5219e6
commit
4afc08e45c
@ -83,7 +83,7 @@ copy_n__(RAIter first, Size count,
|
|||||||
template <class InputIter, class Size, class OutputIter>
|
template <class InputIter, class Size, class OutputIter>
|
||||||
inline OutputIter
|
inline OutputIter
|
||||||
copy_n__(InputIter first, Size count, OutputIter result) {
|
copy_n__(InputIter first, Size count, OutputIter result) {
|
||||||
typedef std::iterator_traits<InputIter>::iterator_category cat;
|
typedef typename std::iterator_traits<InputIter>::iterator_category cat;
|
||||||
return copy_n__(first, count, result, cat());
|
return copy_n__(first, count, result, cat());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -221,7 +221,7 @@ public:
|
|||||||
operator[](const detail::multi_array::
|
operator[](const detail::multi_array::
|
||||||
index_gen<NumDims,NDims>& indices)
|
index_gen<NumDims,NDims>& indices)
|
||||||
const {
|
const {
|
||||||
typedef const_array_view<NDims>::type return_type;
|
typedef typename const_array_view<NDims>::type return_type;
|
||||||
return
|
return
|
||||||
super_type::generate_array_view(boost::type<return_type>(),
|
super_type::generate_array_view(boost::type<return_type>(),
|
||||||
indices,
|
indices,
|
||||||
@ -507,7 +507,7 @@ public:
|
|||||||
typename array_view<NDims>::type
|
typename array_view<NDims>::type
|
||||||
operator[](const detail::multi_array::
|
operator[](const detail::multi_array::
|
||||||
index_gen<NumDims,NDims>& indices) {
|
index_gen<NumDims,NDims>& indices) {
|
||||||
typedef array_view<NDims>::type return_type;
|
typedef typename array_view<NDims>::type return_type;
|
||||||
return
|
return
|
||||||
super_type::generate_array_view(boost::type<return_type>(),
|
super_type::generate_array_view(boost::type<return_type>(),
|
||||||
indices,
|
indices,
|
||||||
|
@ -95,7 +95,7 @@ public:
|
|||||||
operator[](const boost::detail::multi_array::
|
operator[](const boost::detail::multi_array::
|
||||||
index_gen<NumDims,NDims>& indices)
|
index_gen<NumDims,NDims>& indices)
|
||||||
const {
|
const {
|
||||||
typedef const_array_view<NDims>::type return_type;
|
typedef typename const_array_view<NDims>::type return_type;
|
||||||
return
|
return
|
||||||
super_type::generate_array_view(boost::type<return_type>(),
|
super_type::generate_array_view(boost::type<return_type>(),
|
||||||
indices,
|
indices,
|
||||||
@ -273,7 +273,7 @@ public:
|
|||||||
typename array_view<NDims>::type
|
typename array_view<NDims>::type
|
||||||
operator[](const boost::detail::multi_array::
|
operator[](const boost::detail::multi_array::
|
||||||
index_gen<NumDims,NDims>& indices) {
|
index_gen<NumDims,NDims>& indices) {
|
||||||
typedef array_view<NDims>::type return_type;
|
typedef typename array_view<NDims>::type return_type;
|
||||||
return
|
return
|
||||||
super_type::generate_array_view(boost::type<return_type>(),
|
super_type::generate_array_view(boost::type<return_type>(),
|
||||||
indices,
|
indices,
|
||||||
|
@ -132,7 +132,7 @@ public:
|
|||||||
operator[](const boost::detail::multi_array::
|
operator[](const boost::detail::multi_array::
|
||||||
index_gen<NumDims,NDims>& indices)
|
index_gen<NumDims,NDims>& indices)
|
||||||
const {
|
const {
|
||||||
typedef const_array_view<NDims>::type return_type;
|
typedef typename const_array_view<NDims>::type return_type;
|
||||||
return
|
return
|
||||||
super_type::generate_array_view(boost::type<return_type>(),
|
super_type::generate_array_view(boost::type<return_type>(),
|
||||||
indices,
|
indices,
|
||||||
@ -339,7 +339,7 @@ public:
|
|||||||
typename array_view<NDims>::type
|
typename array_view<NDims>::type
|
||||||
operator[](const boost::detail::multi_array::
|
operator[](const boost::detail::multi_array::
|
||||||
index_gen<NumDims,NDims>& indices) {
|
index_gen<NumDims,NDims>& indices) {
|
||||||
typedef array_view<NDims>::type return_type;
|
typedef typename array_view<NDims>::type return_type;
|
||||||
return
|
return
|
||||||
super_type::generate_array_view(boost::type<return_type>(),
|
super_type::generate_array_view(boost::type<return_type>(),
|
||||||
indices,
|
indices,
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
#define MULTIARRAY_TEST_ASSIGN
|
#define MULTIARRAY_TEST_ASSIGN
|
||||||
#include "generative_tests.hpp"
|
#include "generative_tests.hpp"
|
||||||
|
#include "boost/concept_check.hpp" // for ignore_unused_variable_warning
|
||||||
|
|
||||||
// iterator-test-specific code
|
// iterator-test-specific code
|
||||||
|
|
||||||
@ -112,6 +113,7 @@ void construct_iterators(Array&) {
|
|||||||
#endif
|
#endif
|
||||||
typename Array::const_iterator ci2 = i1;
|
typename Array::const_iterator ci2 = i1;
|
||||||
typename Array::const_reverse_iterator cr2 = cr1;
|
typename Array::const_reverse_iterator cr2 = cr1;
|
||||||
|
ignore_unused_variable_warning(cr2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user