Changeset 2176 for GTP/trunk/Lib/Vis/Preprocessing/src/Mesh.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/Mesh.h (modified) (8 diffs)

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

@@ -3 +3 @@
 
 #include <vector>
-using namespace std;
+//
 #include "Intersectable.h"
 #include "Plane3.h"
@@ -56 +56 @@
 
 /// default vertex container for Mesh
-typedef vector<Vector3> VertexContainer;
+typedef std::vector<Vector3> VertexContainer;
 
 /// default patch container for Mesh
@@ -164 +164 @@
   CastRayToSelectedFaces(
                                                  Ray &ray,
-                                                 const vector<int> &faces,
+                                                 const std::vector<int> &faces,
                                                  Intersectable *instance
                                                  );
@@ -213 +213 @@
   bool CheckMesh() const;
 
-  void Print(ostream &app) const;
-
-  virtual ostream &Describe(ostream &s) const {
+  void Print(std::ostream &app) const;
+
+  virtual std::ostream &Describe(std::ostream &s) const {
         return s<<"Mesh #vertices="<<(int)mVertices.size()<<" #faces="<<(int)mFaces.size();
   }
@@ -224 +224 @@
   friend Mesh *CreateMeshFromBox(const AxisAlignedBox3 &box);
 
-  friend ostream& operator<< (ostream &s, const Vector3 &A);
+  friend std::ostream& operator<< (std::ostream &s, const Vector3 &A);
 
 protected:
@@ -234 +234 @@
 
 // Overload << operator for C++-style output
-inline ostream&
-operator<< (ostream &s, const Mesh &A)
+inline std::ostream&
+operator<< (std::ostream &s, const Mesh &A)
 {
         A.Print(s);
@@ -280 +280 @@
                 CastRay(
                 Ray &ray,
-                const vector<int> &faces
+                const std::vector<int> &faces
                 );
 
 
-        virtual ostream &Describe(ostream &s) {
+        virtual std::ostream &Describe(std::ostream &s) {
                 s<<"MeshInstance Id="<<GetId();
                 return mMesh->Describe(s);
@@ -323 +323 @@
   virtual int CastRay(Ray &ray);
 
-  virtual int CastRay(Ray &ray, const vector<int> &faces);
+  virtual int CastRay(Ray &ray, const std::vector<int> &faces);
 
   virtual int Type() const { return TRANSFORMED_MESH_INSTANCE; }