[Csp-commits] APPLICATIONS/SimData/Include/SimData Vector3.h,1.10,1.11

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv27150/Include/SimData

Modified Files:
	Vector3.h 
Log Message:


Index: Vector3.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Vector3.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Vector3.h	6 Aug 2003 08:35:00 -0000	1.10
--- Vector3.h	7 Aug 2003 17:26:22 -0000	1.11
***************
*** 231,241 ****
  		
  #ifndef SWIG
! 	friend inline double dot(const Vector3& a, const Vector3& b) { return a*b; }
  
! 	friend inline const Vector3 cross(const Vector3& a, const Vector3& b) { return a^b; }
  
  	friend SIMDATA_EXPORT std::ostream& operator << (std::ostream& output, const Vector3& vec);
  
! 	friend inline Vector3 operator * (double lhs, const Vector3 &rhs) { return rhs*lhs; }
  #endif // SWIG
  
--- 231,241 ----
  		
  #ifndef SWIG
! 	friend double dot(const Vector3& a, const Vector3& b); // inline
  
! 	friend const Vector3 cross(const Vector3& a, const Vector3& b); // inline
  
  	friend SIMDATA_EXPORT std::ostream& operator << (std::ostream& output, const Vector3& vec);
  
! 	friend Vector3 operator * (double lhs, const Vector3 &rhs); // inline
  #endif // SWIG
  
***************
*** 304,307 ****
--- 304,312 ----
  };	// end of class Vector3
  
+ inline double dot(const Vector3& a, const Vector3& b) { return a*b; }
+ 
+ inline const Vector3 cross(const Vector3& a, const Vector3& b) { return a^b; }
+ 
+ inline Vector3 operator * (double lhs, const Vector3 &rhs) { return rhs*lhs; }
  
  NAMESPACE_SIMDATA_END // simdata