Merge pull request #8 from boostorg/develop

Please merge to master
Add, and update, documentation build targets.
2026-01-25 06:22:10 +00:00 · 2017-09-19 06:42:01 -07:00 · 2016-10-07 23:07:35 -05:00 · 2015-11-01 01:01:38 -08:00 · 2015-11-01 01:01:18 -08:00 · 2014-10-05 09:10:35 -07:00
6 changed files with 30 additions and 6 deletions
--- 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 
    :
        <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)/../
    ;

--- 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 @@ private:

 } // namespace boost

+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
+#  pragma GCC diagnostic pop
+#endif
+
 #endif // BOOST_MULTI_ARRAY_RG071801_HPP
--- a/include/boost/multi_array/base.hpp
+++ b/include/boost/multi_array/base.hpp
@@ -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


--- a/include/boost/multi_array/concept_checks.hpp
+++ b/include/boost/multi_array/concept_checks.hpp
@@ -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 ];
    }
  };
--- 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<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<
--- a/meta/libraries.json
+++ 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 <garcia -at- osl.iu.edu>"
+    ]
+}
Author	SHA1	Message	Date
rxg	abcb2839d5	Merge pull request #8 from boostorg/develop Please merge to master	2017-09-19 06:42:01 -07:00
Rene Rivera	83c3738519	Add, and update, documentation build targets.	2016-10-07 23:07:35 -05:00
Ronald Garcia	fcfb551a1c	Merge branch 'develop' of https://github.com/boostorg/multi_array into develop	2015-11-01 01:01:38 -08:00
Ronald Garcia	fcf70a4560	committing https://github.com/boostorg/multi_array/pull/6 to master.	2015-11-01 01:01:18 -08:00
rxg	5578fc341e	Merge pull request #6 from MarcelRaad/patch-1 Fix clang warning	2014-10-05 09:10:35 -07:00
Marcel Raad	973ef10b02	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.	2014-09-26 10:54:24 +02:00
rxg	43ef0fec88	Merge pull request #5 from danieljames/metadata Create metadata file.	2014-08-24 23:54:48 -04:00
Daniel James	9ac138b91a	Add metadata file.	2014-08-18 15:07:45 +01:00
Ronald Garcia	bf7d4881c0	Merge branch 'develop' of https://github.com/boostorg/multi_array into develop	2014-08-15 10:00:17 -07:00
Ronald Garcia	83493ba231	Modified fix for sergiud, for warning-less compilation on MSVC12.0 at level 4 in release mode. Fixes #2	2014-08-15 09:54:17 -07:00
rxg	8b22b92d88	Merge pull request #4 from jzmaddock/patch-2 Update Jamfile.v2	2014-08-14 17:08:45 -07:00
jzmaddock	484645ee98	Update Jamfile.v2 Fix image location for PDF doc build.	2014-08-14 17:57:55 +01:00
Ronald Garcia	013ed850c5	Fixes #9886 . Suppress -Wshadow-warnings warnings inside multi_array implementation.	2014-05-01 11:47:26 -07:00
Ronald Garcia	8da3864210	GCC 4.8 -Wunused-local-typedefs complains about an unused local typedef. fixes #9888.	2014-04-23 10:14:08 -07:00