Browse Source

vc++ doesn't like 'vector'

David Rose 24 years ago
parent
commit
d05416a7cd
2 changed files with 3 additions and 3 deletions
  1. 2 2
      panda/src/gobj/lens.cxx
  2. 1 1
      panda/src/gobj/lens.h

+ 2 - 2
panda/src/gobj/lens.cxx

@@ -1660,8 +1660,8 @@ build_shear_mat(LMatrix4f &shear_mat,
 ////////////////////////////////////////////////////////////////////
 float Lens::
 sqr_dist_to_line(const LPoint3f &point, const LPoint3f &origin, 
-                 const LVector3f &vector) {
-  LVector3f norm = vector;
+                 const LVector3f &vec) {
+  LVector3f norm = vec;
   norm.normalize();
   LVector3f d = point - origin;
   float hyp_2 = d.length_squared();

+ 1 - 1
panda/src/gobj/lens.h

@@ -173,7 +173,7 @@ private:
                               const LPoint3f &cul, const LPoint3f &cur,
                               const LPoint3f &cll, const LPoint3f &clr);
   static float sqr_dist_to_line(const LPoint3f &point, const LPoint3f &origin, 
-                                const LVector3f &vector);
+                                const LVector3f &vec);
 
 protected:
   string _change_event;