Últimos cambios y documentación.

[z.facultad/75.68/celdas.git] / trunk / src / indicemagico.h

diff --git a/trunk/src/indicemagico.h b/trunk/src/indicemagico.h
index 01dae6d734429c0b14be51c81c72b74ee0e28f63..9ad336e62dc778bf41da49109f8775624539f8cd 100644 (file)
--- a/trunk/src/indicemagico.h
+++ b/trunk/src/indicemagico.h
@@ -114,23 +114,41 @@ public:
 };
 
 template < typename T >
 };
 
 template < typename T >

+inline

 std::ostream& operator<< (std::ostream& os, CIndiceMagico<T>& im)
 {
        unsigned c = im.count();
 std::ostream& operator<< (std::ostream& os, CIndiceMagico<T>& im)
 {
        unsigned c = im.count();

+#ifdef LOG
+       if (c-- == 0) return os << "";
+       for (unsigned i = 0; i < c; ++i)
+               os << im[i] << ",";
+       os << im[c];
+       return os;
+#else // ! LOG

        if (c == 0) return os << "\t\tvacío\n";
        for (unsigned i = 0; i < c; ++i)
                os << "\t\t" << im.keys(i) << ":\t" << im[i] << "\n";
        return os;
        if (c == 0) return os << "\t\tvacío\n";
        for (unsigned i = 0; i < c; ++i)
                os << "\t\t" << im.keys(i) << ":\t" << im[i] << "\n";
        return os;

+#endif // LOG

 }
 
 template < typename T >
 }
 
 template < typename T >

+inline

 std::ostream& operator<< (std::ostream& os, CIndiceMagico<T*>& im)
 {
        unsigned c = im.count();
 std::ostream& operator<< (std::ostream& os, CIndiceMagico<T*>& im)
 {
        unsigned c = im.count();

+#ifdef LOG
+       if (c-- == 0) return os << "";
+       for (unsigned i = 0; i < c; ++i)
+               os << *im[i] << ",";
+       os << *im[c];
+       return os;
+#else // ! LOG

        if (c == 0) return os << "\t\tvacío\n";
        for (unsigned i = 0; i < c; ++i)
                os << "\t\t" << im.keys(i) << ":\t" << *im[i] << "\n";
        return os;
        if (c == 0) return os << "\t\tvacío\n";
        for (unsigned i = 0; i < c; ++i)
                os << "\t\t" << im.keys(i) << ":\t" << *im[i] << "\n";
        return os;

+#endif // LOG

 }
 
 #endif
 }
 
 #endif