Changeset 1651

Timestamp:

Dec 15, 2008, 1:57:43 PM (15 years ago)

Author:

Peter

Message:

fixes #467 - implicit conversion between Vector and its Views are no longer allowed

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• yat/utility/Vector.h (modified) (2 diffs)
• yat/utility/VectorConstView.h (modified) (1 diff)
• yat/utility/VectorMutable.cc (modified) (1 diff)
• yat/utility/VectorMutable.h (modified) (1 diff)
• yat/utility/VectorView.cc (modified) (2 diffs)
• yat/utility/VectorView.h (modified) (3 diffs)

trunk/NEWS

@@ -5 +5 @@
 Version 0.5 (released DATE)
 
+  - Imlicit conversion between Vector and its Views disabled (ticket:467)
   - Averager::add (and siblings) take a (signed) long (ticket:361)
   - IteratorPolicy removed (ticket:398)

trunk/yat/utility/Vector.h

@@ -71 +71 @@
        \throw GSL_error if memory allocation fails.
     */
-    Vector(size_t n, double init_value=0);
+    explicit Vector(size_t n, double init_value=0);
 
     /**
@@ -87 +87 @@
        fails.
     */
-    Vector(const VectorBase& other);
+    explicit Vector(const VectorBase& other);
 
     /**

trunk/yat/utility/VectorConstView.h

@@ -64 +64 @@
        \brief Copy a VectorBase
     */ 
-    VectorConstView(const VectorBase& other);
+    explicit VectorConstView(const VectorBase& other);
 
     /**

trunk/yat/utility/VectorMutable.cc

@@ -180 +180 @@
 
 
-  VectorMutable::operator proxy()
-  {
-    assert(vec_==const_vec_);
-    proxy p;
-    p.vec_ = vec_;
-    vec_ = NULL; // proxy takes ownership and delivers to its receiver
-    const_vec_ = NULL;
-    return p;
-  }
-
 }}} // of namespace utility, yat, and thep

trunk/yat/utility/VectorMutable.h

@@ -220 +220 @@
     gsl_vector* vec_;
 
-    /**
-       Proxy class used to allow copy and assignment of VectorView. By
-       design vectors and matrices are passed as non-const references
-       in all constructors of VectorView. Because the standard does
-       not allow temporary objects to be bound to non-const
-       references, it is not possible to directly construct a
-       VectorView from a temporary VectorView returned from a
-       function. Instead this proxy class is created from the
-       temporary object and then a VectorView can be created from this
-       proxy.
-
-       \see VectorView
-     */
-    struct proxy 
-    { 
-      /// pointer to GSL vector keeping everything we need to create a
-      /// new VectorMutable from a proxy.
-      gsl_vector* vec_;
-    };
-
   private:
     // copy assignment not allowed
     const VectorMutable& operator=(const VectorMutable&);
-  public:
-    /**
-       conversion operator to protected proxy class. 
-     */
-    operator proxy();
 
   };

trunk/yat/utility/VectorView.cc

@@ -124 +124 @@
 
 
-
   const VectorView& VectorView::operator=(const VectorView& other )
   {
@@ -147 +146 @@
 
 
+  VectorView::operator proxy()
+  {
+    assert(vec_==const_vec_);
+    proxy p;
+    p.vec_ = vec_;
+    vec_ = NULL; // proxy takes ownership and delivers to its receiver
+    const_vec_ = NULL;
+    return p;
+  }
+
+
 }}} // of namespace utility, yat, and thep

trunk/yat/utility/VectorView.h

@@ -110 +110 @@
        is undefined.
     */
-    VectorView(VectorMutable& other);
+    explicit VectorView(VectorMutable& other);
 
     /**
@@ -143 +143 @@
     VectorView(Matrix& m, size_t i, bool row=true);
 
-    /**
-       \brief create VectorView from proxy class
-     */
-    VectorView(proxy p);
-
     ///
     /// The destructor.
@@ -186 +181 @@
 
     gsl_vector_view* view_;
+
+    /**
+       Proxy class used to allow copy and assignment of VectorView. By
+       design vectors and matrices are passed as non-const references
+       in all constructors of VectorView. Because the standard does
+       not allow temporary objects to be bound to non-const
+       references, it is not possible to directly construct a
+       VectorView from a temporary VectorView returned from a
+       function. Instead this proxy class is created from the
+       temporary object and then a VectorView can be created from this
+       proxy.
+     */
+    struct proxy 
+    { 
+      /// pointer to GSL vector keeping everything we need to create a
+      /// new VectorMutable from a proxy.
+      gsl_vector* vec_;
+    };
+
+  public:
+    /**
+       \brief create VectorView from proxy class
+     */
+    VectorView(proxy p);
+
+    /**
+       conversion operator to private proxy class. 
+     */
+    operator proxy();
   };