Changeset 2176 for GTP/trunk/Lib/Vis/Preprocessing/src/Ray.h

Timestamp:

02/28/07 19:38:47 (17 years ago)

Author:

mattausch

Message:

removed using namespace std from .h

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Ray.h (modified) (4 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/Ray.h

@@ -72 +72 @@
   Intersection sourceObject;
   
-  vector<Intersection> intersections;
- // vector<BspIntersection> bspIntersections;
-  vector<KdLeaf *> kdLeaves;
-  vector<Intersectable *> testedObjects;
+  std::vector<Intersection> intersections;
+ // std::vector<BspIntersection> bspIntersections;
+  std::vector<KdLeaf *> kdLeaves;
+  std::vector<Intersectable *> testedObjects;
 
   // various flags
@@ -244 +244 @@
 
 private:
-  Vector3 loc, dir;             // Describes ray origin and vector
+  Vector3 loc, dir;             // Describes ray origin and std::vector
   
   // The inverted direction of the ray components. It is computed optionally
@@ -284 +284 @@
   friend int MakeIntersectLine(const Plane3 &p, const Plane3 &q, Ray &ray);
 
-        friend ostream &operator<<(ostream &s, const Ray &r) {
+        friend std::ostream &operator<<(std::ostream &s, const Ray &r) {
                 return s<<"Ray:loc="<<r.loc<<" dir="<<r.dir;
         }
@@ -311 +311 @@
   int GetEntryIndex(const Vector3 &direction) const;
 
-  friend ostream &operator<<(ostream &s, const PassingRaySet &set);
+  friend std::ostream &operator<<(std::ostream &s, const PassingRaySet &set);
 
 };