El make_tar va a usar el numero de REV en breve

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

diff --git a/Model/include/or.h b/Model/include/or.h
index 0bbc22cb6fe7a9a625b530b814f2e48a703c4512..b7d6d0c3bd81c11aed3de43bebb4b84ca8da4f8f 100644 (file)
--- a/Model/include/or.h
+++ b/Model/include/or.h
@@ -4,15 +4,15 @@
 
 #include "logiccontrol.h"
 #include <iostream>
-#include <limits.g>
+#include <limits.h>
 
 namespace PlaQui {
 namespace Model {
 
 /** Función O Lógica */
-class Or:LogicControl {
+class Or:public LogicControl {
 public:
-       Or():LogicControl(MAX_INT,1) {}
+       Or():LogicControl(INT_MAX,1) {}
        virtual ~Or() {}
 
        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_entrada || mi_entrada->get_output();
                }
                return mi_salida;
        }