Changeset 1010

Timestamp:

Feb 1, 2008, 2:12:31 PM (16 years ago)

Author:

Peter

Message:

init some pointers to null and removing conflict

Location:

trunk/yat/utility

Files:

• vector.cc (modified) (1 diff)
• vectorView.cc (modified) (5 diffs)

trunk/yat/utility/vector.cc

@@ -232 +232 @@
 
 
-<<<<<<< .working
   void set_basis(vector& v, size_t i)
   {

trunk/yat/utility/vectorView.cc

@@ -44 +44 @@
 
   vectorView::vectorView(void)
-    : vectorBase()
+    : vectorBase(), view_(NULL), const_view_(NULL)
   {
   }
@@ -50 +50 @@
 
   vectorView::vectorView(vectorView& other)
-    : vectorBase()
+    : vectorBase(), const_view_(NULL)
   {
     view_ = new gsl_vector_view(gsl_vector_subvector(other.gsl_vector_p(), 
@@ -69 +69 @@
 
   vectorView::vectorView(vectorBase& other)
-    : vectorBase(other.gsl_vector_p())
+    : vectorBase(other.gsl_vector_p()), const_view_(NULL)
   {
     view_ = 
@@ -86 +86 @@
 
   vectorView::vectorView(vectorBase& v, size_t offset,size_t n,size_t stride)
-    : vectorBase()
+    : vectorBase(), const_view_(NULL)
   {
     view_ = 
@@ -107 +107 @@
 
   vectorView::vectorView(matrix& m, size_t i, bool row)
-    : vectorBase()
+    : vectorBase(), const_view_(NULL)
   {
     view_=new gsl_vector_view(row ?