From 124d85c0ae51a7e89fe53a0bf15cc7ce333189d5 Mon Sep 17 00:00:00 2001 From: Ronald Garcia Date: Mon, 20 May 2002 18:01:18 +0000 Subject: [PATCH] moved multi_array_ref.hpp into the multi_array directory. It is no longer a top-level include since it relies on multi_array anyway. Updated regression tests accordingly. [SVN r13991] --- include/boost/multi_array.hpp | 7 +------ include/boost/multi_array/base.hpp | 2 +- include/boost/{ => multi_array}/multi_array_ref.hpp | 0 test/constructors.cpp | 1 - test/fail_ref_cbracket.cpp | 2 +- test/fail_ref_cdata.cpp | 2 +- test/fail_ref_citerator.cpp | 2 +- test/fail_ref_cparen.cpp | 2 +- test/fail_ref_criterator.cpp | 2 +- test/fail_ref_csubarray.cpp | 2 +- test/fail_ref_csubarray2.cpp | 2 +- test/fail_ref_csubarray3.cpp | 2 +- test/fail_ref_cview.cpp | 2 +- test/fail_ref_cview2.cpp | 2 +- test/fail_ref_cview3.cpp | 2 +- test/generative_tests.hpp | 1 - 16 files changed, 13 insertions(+), 20 deletions(-) rename include/boost/{ => multi_array}/multi_array_ref.hpp (100%) diff --git a/include/boost/multi_array.hpp b/include/boost/multi_array.hpp index af21011..a9481b9 100644 --- a/include/boost/multi_array.hpp +++ b/include/boost/multi_array.hpp @@ -11,7 +11,7 @@ #include "boost/multi_array/copy_array.hpp" #include "boost/multi_array/iterator.hpp" #include "boost/multi_array/subarray.hpp" -#include "boost/multi_array_ref.hpp" +#include "boost/multi_array/multi_array_ref.hpp" #include "boost/multi_array/algorithm.hpp" #include "boost/array.hpp" #include "boost/type_traits.hpp" @@ -46,11 +46,6 @@ public: typedef typename super_type::extent_range extent_range; - // concept checks - // BOOST_CLASS_REQUIRES(T,DefaultConstructibleConcept); - // BOOST_CLASS_REQUIRES(T,AssignableConcept); - // BOOST_CLASS_REQUIRES(T,LessThanComparableConcept); - // BOOST_CLASS_REQUIRES(T,CopyConstructibleConcept); template struct const_array_view { typedef boost::detail::multi_array::const_multi_array_view type; diff --git a/include/boost/multi_array/base.hpp b/include/boost/multi_array/base.hpp index 74c0f63..67807d2 100644 --- a/include/boost/multi_array/base.hpp +++ b/include/boost/multi_array/base.hpp @@ -47,7 +47,7 @@ namespace multi_array_types { // own objects. On the other hand, one may not want the overhead of // object creation in small-memory environments. Thus, the objects // can be left undefined by defining BOOST_MULTI_ARRAY_NO_GENERATORS -// before loading multi_array.hpp or multi_array_ref.hpp +// before loading multi_array.hpp. #if !BOOST_MULTI_ARRAY_NO_GENERATORS namespace { multi_array_types::extent_gen extents; diff --git a/include/boost/multi_array_ref.hpp b/include/boost/multi_array/multi_array_ref.hpp similarity index 100% rename from include/boost/multi_array_ref.hpp rename to include/boost/multi_array/multi_array_ref.hpp diff --git a/test/constructors.cpp b/test/constructors.cpp index d6494a0..5431f8d 100644 --- a/test/constructors.cpp +++ b/test/constructors.cpp @@ -7,7 +7,6 @@ #include "boost/test/test_tools.hpp" #include "boost/multi_array.hpp" -#include "boost/multi_array_ref.hpp" #include #include diff --git a/test/fail_ref_cbracket.cpp b/test/fail_ref_cbracket.cpp index 6775a56..5a0473f 100644 --- a/test/fail_ref_cbracket.cpp +++ b/test/fail_ref_cbracket.cpp @@ -3,7 +3,7 @@ // checking constness of const operator[]. // -#include "boost/multi_array_ref.hpp" +#include "boost/multi_array.hpp" #define BOOST_INCLUDE_MAIN #include "boost/test/test_tools.hpp" diff --git a/test/fail_ref_cdata.cpp b/test/fail_ref_cdata.cpp index d592afe..2665577 100644 --- a/test/fail_ref_cdata.cpp +++ b/test/fail_ref_cdata.cpp @@ -3,7 +3,7 @@ // Testing data() member function constness. // -#include "boost/multi_array_ref.hpp" +#include "boost/multi_array.hpp" #define BOOST_INCLUDE_MAIN #include "boost/test/test_tools.hpp" diff --git a/test/fail_ref_citerator.cpp b/test/fail_ref_citerator.cpp index 9c4fb17..472162b 100644 --- a/test/fail_ref_citerator.cpp +++ b/test/fail_ref_citerator.cpp @@ -3,7 +3,7 @@ // const_iterator/iterator conversion test // -#include "boost/multi_array_ref.hpp" +#include "boost/multi_array.hpp" #define BOOST_INCLUDE_MAIN #include "boost/test/test_tools.hpp" diff --git a/test/fail_ref_cparen.cpp b/test/fail_ref_cparen.cpp index 8c86dab..044565d 100644 --- a/test/fail_ref_cparen.cpp +++ b/test/fail_ref_cparen.cpp @@ -3,7 +3,7 @@ // Testing const operator() constness. // -#include "boost/multi_array_ref.hpp" +#include "boost/multi_array.hpp" #define BOOST_INCLUDE_MAIN #include "boost/test/test_tools.hpp" diff --git a/test/fail_ref_criterator.cpp b/test/fail_ref_criterator.cpp index 5416a73..7e0eeed 100644 --- a/test/fail_ref_criterator.cpp +++ b/test/fail_ref_criterator.cpp @@ -3,7 +3,7 @@ // const_reverse_iterator/reverse_iterator conversion test // -#include "boost/multi_array_ref.hpp" +#include "boost/multi_array.hpp" #define BOOST_INCLUDE_MAIN #include "boost/test/test_tools.hpp" diff --git a/test/fail_ref_csubarray.cpp b/test/fail_ref_csubarray.cpp index 9aef297..f745a93 100644 --- a/test/fail_ref_csubarray.cpp +++ b/test/fail_ref_csubarray.cpp @@ -3,7 +3,7 @@ // Testing subarray and const_subarray assignment // -#include "boost/multi_array_ref.hpp" +#include "boost/multi_array.hpp" #define BOOST_INCLUDE_MAIN #include "boost/test/test_tools.hpp" diff --git a/test/fail_ref_csubarray2.cpp b/test/fail_ref_csubarray2.cpp index af86386..6fd8967 100644 --- a/test/fail_ref_csubarray2.cpp +++ b/test/fail_ref_csubarray2.cpp @@ -3,7 +3,7 @@ // Testing constness of subarray operations. // -#include "boost/multi_array_ref.hpp" +#include "boost/multi_array.hpp" #define BOOST_INCLUDE_MAIN #include "boost/test/test_tools.hpp" diff --git a/test/fail_ref_csubarray3.cpp b/test/fail_ref_csubarray3.cpp index fc89516..ec4e212 100644 --- a/test/fail_ref_csubarray3.cpp +++ b/test/fail_ref_csubarray3.cpp @@ -3,7 +3,7 @@ // Testing constness of subarray operations. // -#include "boost/multi_array_ref.hpp" +#include "boost/multi_array.hpp" #define BOOST_INCLUDE_MAIN #include "boost/test/test_tools.hpp" diff --git a/test/fail_ref_cview.cpp b/test/fail_ref_cview.cpp index d8bb157..317aeaf 100644 --- a/test/fail_ref_cview.cpp +++ b/test/fail_ref_cview.cpp @@ -3,7 +3,7 @@ // ensure const_array_view doesn't allow element assignment. // -#include "boost/multi_array_ref.hpp" +#include "boost/multi_array.hpp" #define BOOST_INCLUDE_MAIN #include "boost/test/test_tools.hpp" diff --git a/test/fail_ref_cview2.cpp b/test/fail_ref_cview2.cpp index b7f5f20..e8e9525 100644 --- a/test/fail_ref_cview2.cpp +++ b/test/fail_ref_cview2.cpp @@ -3,7 +3,7 @@ // ensure const_array_view cannot be converted to array_view // -#include "boost/multi_array_ref.hpp" +#include "boost/multi_array.hpp" #define BOOST_INCLUDE_MAIN #include "boost/test/test_tools.hpp" diff --git a/test/fail_ref_cview3.cpp b/test/fail_ref_cview3.cpp index 1604a88..b958807 100644 --- a/test/fail_ref_cview3.cpp +++ b/test/fail_ref_cview3.cpp @@ -3,7 +3,7 @@ // ensure const_array_view doesn't allow assignment. // -#include "boost/multi_array_ref.hpp" +#include "boost/multi_array.hpp" #define BOOST_INCLUDE_MAIN #include "boost/test/test_tools.hpp" diff --git a/test/generative_tests.hpp b/test/generative_tests.hpp index 68b573f..cc2d6c0 100644 --- a/test/generative_tests.hpp +++ b/test/generative_tests.hpp @@ -34,7 +34,6 @@ // int test_main(int,char**) { return run_generative_tests(); } // #include "boost/multi_array.hpp" -#include "boost/multi_array_ref.hpp" #define BOOST_INCLUDE_MAIN #include "boost/test/test_tools.hpp"