Changeset 2575 for GTP/trunk/Lib/Vis/Preprocessing/src/BitVectorPvs.h

Timestamp:

01/03/08 15:53:44 (17 years ago)

Author:

bittner

Message:

big merge: preparation for havran ray caster, check if everything works

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/BitVectorPvs.h (modified) (7 diffs)

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

@@ -79 +79 @@
 class BitVectorPvs//: public PvsBase<T>
 {
-        template<typename T, typename S> friend class BitVectorPvsIterator;
+  template<typename T1, typename S1> friend class BitVectorPvsIterator;
 
 public:
@@ -121 +121 @@
         bool Find(T sample);
 
-        typename BitVectorPvsIterator<T, S> GetIterator() const;
+        BitVectorPvsIterator<T, S> GetIterator() const;
 
         /** Compute continuous PVS difference 
@@ -145 +145 @@
         void MergeInPlace(const BitVectorPvs<T, S> &a)
         {
-                cerr << "bitvector: merge in place not implemented yet" << endl;
+          std::cerr << "bitvector: merge in place not implemented yet"
+                    << std::endl;
         }
 
@@ -167 +168 @@
         int SubtractPvs(const BitVectorPvs<T, S> &pvs)
         {
-                cerr << "not yet implemented" << endl;
-                return 0;
+          std::cerr << "not yet implemented" << std::endl;
+          return 0;
         }
 
@@ -177 +178 @@
                                                                                 float &pvsEnlargement)
         {
-                cerr << "not yet implemented" << endl;
+          std::cerr << "not yet implemented" << std::endl;
         }
 
@@ -284 +285 @@
 
 template <typename T, typename S>
-void BitVectorPvs<T, S>::Clear(const bool trim = true)
+void BitVectorPvs<T, S>::Clear(const bool trim)
 {
         bit_vector::iterator bit, bit_end = mEntries.end();
@@ -309 +310 @@
 
 template <typename T, typename S>
-typename BitVectorPvsIterator<T, S> BitVectorPvs<T, S>::GetIterator() const
-{
-        BitVectorPvsIterator<T, S> pit(mEntries.begin(), mEntries.end());
-
-        return pit;
+BitVectorPvsIterator<T, S> BitVectorPvs<T, S>::GetIterator() const
+{
+  return BitVectorPvsIterator<T, S>(mEntries.begin(), mEntries.end());
 }