From 8da3864210569381b359b4fd35f3f6c96e5569d4 Mon Sep 17 00:00:00 2001 From: Ronald Garcia Date: Wed, 23 Apr 2014 10:14:08 -0700 Subject: [PATCH 1/8] GCC 4.8 -Wunused-local-typedefs complains about an unused local typedef. fixes #9888. --- include/boost/multi_array/concept_checks.hpp | 4 ---- 1 file changed, 4 deletions(-) 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 ]; } }; From 013ed850c572e07523c7729b0392b7a7f1f149b2 Mon Sep 17 00:00:00 2001 From: Ronald Garcia Date: Thu, 1 May 2014 11:47:26 -0700 Subject: [PATCH 2/8] Fixes #9886. Suppress -Wshadow-warnings warnings inside multi_array implementation. --- include/boost/multi_array.hpp | 9 +++++++++ 1 file changed, 9 insertions(+) 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 From 484645ee98861146815eec24b54c873147f5ed0f Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Thu, 14 Aug 2014 17:57:55 +0100 Subject: [PATCH 3/8] Update Jamfile.v2 Fix image location for PDF doc build. --- doc/xml/Jamfile.v2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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)/../ ; From 83493ba2316f48ffc56cf934e3164feb4aa1433f Mon Sep 17 00:00:00 2001 From: Ronald Garcia Date: Fri, 15 Aug 2014 09:54:17 -0700 Subject: [PATCH 4/8] Modified fix for sergiud, for warning-less compilation on MSVC12.0 at level 4 in release mode. Fixes #2 --- include/boost/multi_array/base.hpp | 1 + 1 file changed, 1 insertion(+) 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 From 9ac138b91a7d98bea807b33e8fbabfdd256a3850 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 18 Aug 2014 15:07:45 +0100 Subject: [PATCH 5/8] Add metadata file. --- meta/libraries.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 meta/libraries.json 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 " + ] +} From 973ef10b022e60eb9857d12ccce081754c5a5406 Mon Sep 17 00:00:00 2001 From: Marcel Raad Date: Fri, 26 Sep 2014 10:54:24 +0200 Subject: [PATCH 6/8] Fix clang warning clang complains about the friend declaration with a warning: warning : unqualified friend declaration referring to type outside of the nearest enclosing namespace is a Microsoft extension; add a nested name specifier [-Wmicrosoft] friend class iterator_core_access; ^ ::boost:: Explicitly qualifying the class name with its namespace fixes the warning. --- include/boost/multi_array/iterator.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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< From fcf70a456089ff93ef84b8bc175ff302e3caaef6 Mon Sep 17 00:00:00 2001 From: Ronald Garcia Date: Sun, 1 Nov 2015 01:01:18 -0800 Subject: [PATCH 7/8] committing https://github.com/boostorg/multi_array/pull/6 to master. --- include/boost/multi_array/iterator.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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< From 83c3738519a442c619f9ef661335acde6878b7d8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 7 Oct 2016 23:07:35 -0500 Subject: [PATCH 8/8] Add, and update, documentation build targets. --- doc/build.jam | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/build.jam 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 ;