Changeset 1118 for trunk

Timestamp:

Feb 21, 2008, 11:08:23 PM (16 years ago)

Author:

Peter

Message:

fixing memory bug in VectorView? - fixes #305

Location:

trunk/yat/utility

Files:

• VectorMutable.cc (modified) (1 diff)
• VectorMutable.h (modified) (2 diffs)
• VectorView.cc (modified) (3 diffs)
• VectorView.h (modified) (1 diff)

trunk/yat/utility/VectorMutable.cc

@@ -177 +177 @@
   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;
   }

trunk/yat/utility/VectorMutable.h

@@ -220 +220 @@
        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 thsi
+       temporary object and then a VectorView can be created from this
        proxy.
 
@@ -231 +231 @@
 
   private:
-    // copy assignment no allowed
+    // copy assignment not allowed
     const VectorMutable& operator=(const VectorMutable&);
   public:

trunk/yat/utility/VectorView.cc

@@ -63 +63 @@
     : VectorMutable()
   {
-    view_ = new gsl_vector_view(gsl_vector_subvector(other.gsl_vector_p(), 
-                                                     0,other.size()));
-    const_vec_ = vec_ = &(view_->vector);
+    copy(other.gsl_vector_p());
   }
 
@@ -90 +88 @@
 
   VectorView::VectorView(proxy p)
-    : VectorMutable(p.vec_), view_(NULL)
+    : VectorMutable(), view_(NULL)
   {
+    copy(p.vec_);
   }
 
@@ -111 +110 @@
     return *this;
   } 
+
+
+  void VectorView::copy(gsl_vector* other )
+  {
+    view_ = new gsl_vector_view(gsl_vector_subvector(other,0,other->size));
+    const_vec_ = vec_ = &(view_->vector);
+  }
 
 

trunk/yat/utility/VectorView.h

@@ -185 +185 @@
   private:
     const VectorView& assign(const VectorBase& other);
+    void copy(gsl_vector*);
     void delete_allocated_memory(void);