boost_mirror/multi_array
1
0
Fork 0
mirror of https://github.com/boostorg/multi_array.git synced 2025-05-11 13:23:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8 from boostorg/develop

Browse Source 
Please merge to master
This commit is contained in:
rxg 2017-09-19 06:42:01 -07:00 committed by GitHub
commit abcb2839d5
6 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/xml/Jamfile.v2
View File

@ -3,14 +3,17 @@
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
project boost/doc ;
project multi_array/doc ;
import boostbook : boostbook ;
path-constant here : . ;
boostbook multi_array-doc
:
bbref.xml
:
<xsl:param>boost.root=../../../../..
<format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
<format>pdf:<xsl:param>img.src.path=$(here)/../
;

9
include/boost/multi_array.hpp
View File

@ -18,6 +18,11 @@
// declaration and definition
//
#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wshadow"
#endif
#include "boost/multi_array/base.hpp"
#include "boost/multi_array/collection_concept.hpp"
#include "boost/multi_array/copy_array.hpp"
@ -496,4 +501,8 @@ private:
} // namespace boost
#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
# pragma GCC diagnostic pop
#endif
#endif // BOOST_MULTI_ARRAY_RG071801_HPP

1
include/boost/multi_array/base.hpp
View File

@ -463,6 +463,7 @@ protected:
index bound_adjustment = stride < 0 ? 1 : 0;
BOOST_ASSERT(((index_bases[n] - bound_adjustment) <= finish) &&
(finish <= (index_bases[n] + index(extents[n]) - bound_adjustment)));
ignore_unused_variable_warning(bound_adjustment);
#endif // BOOST_DISABLE_ASSERTS

4
include/boost/multi_array/concept_checks.hpp
View File

@ -39,8 +39,6 @@ namespace detail {
template <typename Array, typename IdxGen, typename Call_Type>
static void call(Array& a, const IdxGen& idgen, Call_Type c) {
typedef typename Array::index_range index_range;
typedef typename Array::index index;
idgen_helper<N-1>::call(a,idgen[c],c);
}
};
@ -50,8 +48,6 @@ namespace detail {
template <typename Array, typename IdxGen, typename Call_Type>
static void call(Array& a, const IdxGen& idgen, Call_Type) {
typedef typename Array::index_range index_range;
typedef typename Array::index index;
a[ idgen ];
}
};

2
include/boost/multi_array/iterator.hpp
View File

@ -60,7 +60,7 @@ class array_iterator
, private
value_accessor_generator<T,NumDims>::type
{
friend class iterator_core_access;
friend class ::boost::iterator_core_access;
typedef detail::multi_array::associated_types<T,NumDims> access_t;
typedef iterator_facade<

15
meta/libraries.json Normal file
View File

@ -0,0 +1,15 @@
{
"key": "multi_array",
"name": "Multi-Array",
"authors": [
"Ron Garcia"
],
"description": "Boost.MultiArray provides a generic N-dimensional array concept definition and common implementations of that interface.",
"category": [
"Containers",
"Math"
],
"maintainers": [
"Ronald Garcia <garcia -at- osl.iu.edu>"
]
}