diff --git a/doc/build.jam b/doc/build.jam new file mode 100644 index 00000000..62544e3d --- /dev/null +++ b/doc/build.jam @@ -0,0 +1,15 @@ +# Copyright (c) 2016 Rene Rivera +# +# 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) + +############################################################################### +alias boostdoc + : xml/bbref.xml + : + : + : ; +explicit boostdoc ; +alias boostrelease ; +explicit boostrelease ; diff --git a/doc/xml/Jamfile.v2 b/doc/xml/Jamfile.v2 index ea7be9d7..e52e5e99 100644 --- a/doc/xml/Jamfile.v2 +++ b/doc/xml/Jamfile.v2 @@ -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 : boost.root=../../../../.. pdf:boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html + pdf:img.src.path=$(here)/../ ; diff --git a/include/boost/multi_array.hpp b/include/boost/multi_array.hpp index f459ce91..a134abb5 100644 --- a/include/boost/multi_array.hpp +++ b/include/boost/multi_array.hpp @@ -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 @@ class multi_array : } // namespace boost +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic pop +#endif + #endif // BOOST_MULTI_ARRAY_RG071801_HPP diff --git a/include/boost/multi_array/base.hpp b/include/boost/multi_array/base.hpp index 34e325b2..62e53972 100644 --- a/include/boost/multi_array/base.hpp +++ b/include/boost/multi_array/base.hpp @@ -463,6 +463,7 @@ class multi_array_impl_base 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 diff --git a/include/boost/multi_array/concept_checks.hpp b/include/boost/multi_array/concept_checks.hpp index 3a53df83..9f70ae1c 100644 --- a/include/boost/multi_array/concept_checks.hpp +++ b/include/boost/multi_array/concept_checks.hpp @@ -39,8 +39,6 @@ namespace detail { template 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::call(a,idgen[c],c); } }; @@ -50,8 +48,6 @@ namespace detail { template static void call(Array& a, const IdxGen& idgen, Call_Type) { - typedef typename Array::index_range index_range; - typedef typename Array::index index; a[ idgen ]; } }; diff --git a/include/boost/multi_array/iterator.hpp b/include/boost/multi_array/iterator.hpp index e47e0b39..5cde3305 100644 --- a/include/boost/multi_array/iterator.hpp +++ b/include/boost/multi_array/iterator.hpp @@ -60,7 +60,7 @@ class array_iterator , private value_accessor_generator::type { - friend class iterator_core_access; + friend class ::boost::iterator_core_access; typedef detail::multi_array::associated_types access_t; typedef iterator_facade< diff --git a/meta/libraries.json b/meta/libraries.json new file mode 100644 index 00000000..82b20747 --- /dev/null +++ b/meta/libraries.json @@ -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 " + ] +}