* Se agrega carga de lineas entre compuertas.

[z.facultad/75.42/plaqui.git] / Model / include / and.h

diff --git a/Model/include/and.h b/Model/include/and.h
index 7bd1a89deb7ae9dbf13bdde2d9102494d39f80d8..482576b46af79f77118c0f8ae9b08ef57a215f96 100644 (file)
--- a/Model/include/and.h
+++ b/Model/include/and.h
@@ -4,15 +4,15 @@
 
 #include "logiccontrol.h"
 #include <iostream>
-#include <limits.g>
+#include <limits.h>
 
 namespace PlaQui {
 namespace Model {
 
 /** Función AND Lógica */
-class And:LogicControl {
+class And:public LogicControl {
 public:
-       And():LogicControl(MAX_INT,1) {}
+       And():LogicControl(INT_MAX,1) {}
        virtual ~And() {}
 
        virtual bool get_output() {
@@ -21,8 +21,8 @@ public:
                /* Si tengo alguien conectado */
                std::list<IConector *>::iterator it;
                for(it = in_list.begin(); it != in_list.end(); it++) {
-                       mi_entrada = *it;
-                       mi_salida &&= mi_entrada->get_output();
+                       mi_entrada = static_cast<LogicControl *>(*it);
+                       mi_salida = mi_salida && mi_entrada->get_output();
                }
                return mi_salida;
        }