Changes in src/vector.cpp [b84d5d:2ededc2]

File:

• src/vector.cpp (modified) (8 diffs)

src/vector.cpp

@@ -328 +328 @@
     return false;
   }
-  delete(M);
   Log() << Verbose(1) << "INFO: Line1a = " << *Line1a << ", Line1b = " << *Line1b << ", Line2a = " << *Line2a << ", Line2b = " << *Line2b << "." << endl;
 
@@ -584 +583 @@
  * \return lhs + a
  */
-const Vector& operator+=(Vector& a, const Vector& b)
+Vector& operator+=(Vector& a, const Vector& b)
 {
   a.AddVector(&b);
@@ -595 +594 @@
  * \return lhs - a
  */
-const Vector& operator-=(Vector& a, const Vector& b)
+Vector& operator-=(Vector& a, const Vector& b)
 {
   a.SubtractVector(&b);
@@ -606 +605 @@
  * \return lhs.x[i] * m
  */
-const Vector& operator*=(Vector& a, const double m)
+Vector& operator*=(Vector& a, const double m)
 {
   a.Scale(m);
@@ -617 +616 @@
  * \return a + b
  */
-Vector const operator+(const Vector& a, const Vector& b)
-{
-  Vector x(a);
-  x.AddVector(&b);
-  return x;
+Vector& operator+(const Vector& a, const Vector& b)
+{
+  Vector *x = new Vector;
+  x->CopyVector(&a);
+  x->AddVector(&b);
+  return *x;
 };
 
@@ -629 +629 @@
  * \return a - b
  */
-Vector const operator-(const Vector& a, const Vector& b)
-{
-  Vector x(a);
-  x.SubtractVector(&b);
-  return x;
+Vector& operator-(const Vector& a, const Vector& b)
+{
+  Vector *x = new Vector;
+  x->CopyVector(&a);
+  x->SubtractVector(&b);
+  return *x;
 };
 
@@ -641 +642 @@
  * \return m * a
  */
-Vector const operator*(const Vector& a, const double m)
-{
-  Vector x(a);
-  x.Scale(m);
-  return x;
+Vector& operator*(const Vector& a, const double m)
+{
+  Vector *x = new Vector;
+  x->CopyVector(&a);
+  x->Scale(m);
+  return *x;
 };
 
@@ -653 +655 @@
  * \return m * a
  */
-Vector const operator*(const double m, const Vector& a )
-{
-  Vector x(a);
-  x.Scale(m);
-  return x;
-};
+Vector& operator*(const double m, const Vector& a )
+{
+  Vector *x = new Vector;
+  x->CopyVector(&a);
+  x->Scale(m);
+  return *x;
+};
+
+Vector& Vector::operator=(const Vector& src) {
+  CopyVector(src);
+  return *this;
+}
 
 /** Prints a 3dim vector.