* flower/include/std-vector.hh

* flower/include/array.hh (reverse, swap): Detach from class.
Update users.

* flower/include/std-vector.hh
* flower/include/array.hh (concat): Globally change to insert ().

* flower/include/std-vector.hh
* flower/include/parray.hh
* flower/include/array.hh (elem, elem_ref): Globally replace by
at ().

diff --git a/ChangeLog b/ChangeLog
index 76ed56b9918d5c368e9620b2ed21e54cb3e8bb5e..f49951e374e93379247c52725b61e576976db500 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-02-02  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * flower/include/std-vector.hh (boundary): Oops, reverse.
+
        * flower/string-convert.cc (convert::unsigned_string): Bugfix:
        remove superfluous `d'.
 

diff --git a/flower/include/array.hh b/flower/include/array.hh
index 98e4d1f06050c48d16c93bbf59142e47b1ad51e5..c8110b17909edeb911633f7ed33f333b01b43fcc 100644 (file)
--- a/flower/include/array.hh
+++ b/flower/include/array.hh
@@ -309,7 +309,7 @@ public:
   boundary (Array<T> const &v, int dir, vsize i)
   {
     assert (dir);
-    return v[dir == 1 ? i : v.size () - 1 - i];
+    return v[dir = -1 ? i : v.size () - 1 - i];
   }
 
   template<typename T>
@@ -317,7 +317,7 @@ public:
   boundary (Array<T> &v, int dir, vsize i)
   {
     assert (dir);
-    return v[dir == 1 ? i : v.size () - 1 - i];
+    return v[dir == -1 ? i : v.size () - 1 - i];
   }
 
   template<class T>

diff --git a/flower/include/std-vector.hh b/flower/include/std-vector.hh
index 10018dc1e74786f534cc288a51e4b07a533dcdce..3386ac74b8d117bc64999201dd0fe394811740a9 100644 (file)
--- a/flower/include/std-vector.hh
+++ b/flower/include/std-vector.hh
@@ -38,7 +38,7 @@ namespace std {
   boundary (vector<T> const &v, int dir, vsize i)
   {
     assert (dir);
-    return v[dir == 1 ? i : v.size () - 1 - i];
+    return v[dir == -1 ? i : v.size () - 1 - i];
   }
 
   template<typename T>
@@ -46,7 +46,7 @@ namespace std {
   boundary (vector<T> &v, int dir, vsize i)
   {
     assert (dir);
-    return v[dir == 1 ? i : v.size () - 1 - i];
+    return v[dir == -1 ? i : v.size () - 1 - i];
   }
 
   template<typename T>

diff --git a/flower/test-std.cc b/flower/test-std.cc
index 72e86f110afef40499396116a34431dfd4a6672e..7e7acee091f138b87d1ec8200058c30dd8857af5 100644 (file)
--- a/flower/test-std.cc
+++ b/flower/test-std.cc
@@ -114,7 +114,11 @@ BOOST_AUTO_UNIT_TEST (vector_insert)
 
 BOOST_AUTO_UNIT_TEST (parray_concat)
 {
+#if 1
   Link_array<int> u, v;
+#else
+  vector<int*> u, v;
+#endif  
   int a[5] = { 0, 1, 2, 3, 4 };
   u.push_back (&a[0]);
   u.push_back (&a[1]);