Changeset 3d9045 for molecuilder/src/vector.hpp

Timestamp:

Dec 29, 2008, 12:29:21 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

95183e

Parents:

eec6c8 (diff), 2ac928 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ConcaveHull' of ​ssh://stud64dc-01/home/neuen/workspace/ESPACK into ConcaveHull

Conflicts:

molecuilder/src/boundary.cpp

Fixed the incorporation of write_raster3d_file() ...

File:

• molecuilder/src/vector.hpp (modified) (2 diffs)

molecuilder/src/vector.hpp

@@ -21 +21 @@
   double Projection(const Vector *y) const;
   double Norm() const ;
-  double Angle(const Vector *y) const;
+  double Angle(Vector *y) const;
 
   void AddVector(const Vector *y);
@@ -55 +55 @@
 };
 
-ostream & operator << (ostream& ost, Vector &m);
+ofstream& operator<<(ofstream& ost, Vector& m);
 Vector& operator+=(Vector& a, const Vector& b);
 Vector& operator*=(Vector& a, const double m);