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

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

@@ -99 +99 @@
   
   void
-  Print(ostream &app) const;
-
-  friend ostream &operator<<(ostream &s, const VssStatistics &stat) {
+  Print(std::ostream &app) const;
+
+  friend std::ostream &operator<<(std::ostream &s, const VssStatistics &stat) {
     stat.Print(s);
     return s;
@@ -303 +303 @@
   bool IsLeaf() const { return axis == -1; }
   
-  virtual void Print(ostream &s) const = 0;
+  virtual void Print(std::ostream &s) const = 0;
 
   virtual int GetAccessTime() {
@@ -369 +369 @@
   }
   
-  virtual void Print(ostream &s) const {
+  virtual void Print(std::ostream &s) const {
     if (axis == 0)
       s<<"x ";
@@ -422 +422 @@
   virtual int Type() const  { return ELeaf; }
 
-  virtual void Print(ostream &s) const {
-    s<<endl<<"L: r="<<(int)rays.size()<<endl;
+  virtual void Print(std::ostream &s) const {
+    s<<std::endl<<"L: r="<<(int)rays.size()<<std::endl;
   };
   
@@ -478 +478 @@
   // comparator for the 
   struct less_contribution : public
-  binary_function<const VssTreeLeaf *, const VssTreeLeaf *, bool> {
+  std::binary_function<const VssTreeLeaf *, const VssTreeLeaf *, bool> {
         
         bool operator()(const VssTreeLeaf * a, const VssTreeLeaf *b) {
@@ -486 +486 @@
   
   struct greater_contribution : public
-  binary_function<const VssTreeLeaf *, const VssTreeLeaf *, bool> {
+  std::binary_function<const VssTreeLeaf *, const VssTreeLeaf *, bool> {
         
         bool operator()(const VssTreeLeaf * a, const VssTreeLeaf *b) {
@@ -532 +532 @@
     // comparator for the 
     struct less_priority : public
-    binary_function<const TraversalData, const TraversalData, bool> {
+    std::binary_function<const TraversalData, const TraversalData, bool> {
                         
       bool operator()(const TraversalData a, const TraversalData b) {
@@ -866 +866 @@
   TraverseInternalNode(
                                            RayTraversalData &data,
-                                           stack<RayTraversalData> &tstack);
+                                           std::stack<RayTraversalData> &tstack);
 
   void