update

git-svn-id: https://svn.dealii.org/trunk@9641 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/base/slice_vector.cc b/tests/base/slice_vector.cc
index 1e5ff8a148e8256732d5807dd6edfe9d919a900b..19657fcfab28f3cc2f12337a9955063c9286b980 100644 (file)
--- a/tests/base/slice_vector.cc
+++ b/tests/base/slice_vector.cc
@@ -21,8 +21,9 @@
 
 void f(const std::vector<int>& v)
 {
-  const VectorSlice<const std::vector<int> > s(v,2,3);
-
+  const VectorSlice<const std::vector<int> >
+    s = make_slice(v,2,3);
+  
   for (unsigned int i=0;i<s.size();++i)
     std::cerr << '\t' << s[i];
   std::cerr << std::endl;
@@ -75,7 +76,8 @@ int main()
 
   f(v);
 
-  VectorSlice<std::vector<int> > s2(v, 3, 5);
+  const VectorSlice<const std::vector<int> >
+    s2 = make_slice(v, 3, 5);
   int n = s[4];
   n += 3;
 

diff --git a/tests/results/i686-pc-linux-gnu+gcc3.2/base/slice_vector.output b/tests/results/i686-pc-linux-gnu+gcc3.2/base/slice_vector.output
index 271b2dc929b6589580ff55e497b87b53a54a7889..b62a429bfa51491765a233c5d46f52ec15526a5e 100644 (file)
--- a/tests/results/i686-pc-linux-gnu+gcc3.2/base/slice_vector.output
+++ b/tests/results/i686-pc-linux-gnu+gcc3.2/base/slice_vector.output
@@ -2,8 +2,8 @@
        0       1       2       0       1       2       3
        2       0       1
 --------------------------------------------------------
-An error occurred in file <slice_vector.h> in function
-    SliceVector<VECTOR>::SliceVector(VECTOR&, unsigned int, unsigned int) [with VECTOR = std::vector<int, std::allocator<int> >]
+An error occurred in file <vector_slice.h> in function
+    VectorSlice<VECTOR>::VectorSlice(VECTOR&, unsigned int, unsigned int) [with VECTOR = const std::vector<int, std::allocator<int> >]
 The violated condition was: 
     (start+length<=v.size())
 The name and call sequence of the exception was:
@@ -13,8 +13,8 @@ Index 5 is not in [0,5[
 --------------------------------------------------------
 DEAL::Abort!!!
 --------------------------------------------------------
-An error occurred in file <slice_vector.h> in function
-    typename VECTOR::reference SliceVector<VECTOR>::operator[](unsigned int) [with VECTOR = std::vector<int, std::allocator<int> >]
+An error occurred in file <vector_slice.h> in function
+    typename VECTOR::reference VectorSlice<VECTOR>::operator[](unsigned int) [with VECTOR = std::vector<int, std::allocator<int> >]
 The violated condition was: 
     (i<length)
 The name and call sequence of the exception was: