[Openhpi-svn] SF.net SVN: openhpi:[7135] openhpi/trunk/plugins/dynamic_simulator/ new_sim_domain.cpp

[<lar...@us...>]

Revision: 7135
          http://openhpi.svn.sourceforge.net/openhpi/?rev=7135&view=rev
Author:   larswetzel
Date:     2010-08-28 13:19:32 +0000 (Sat, 28 Aug 2010)

Log Message:
-----------
Fix for bug 3042194

Modified Paths:
--------------
    openhpi/trunk/plugins/dynamic_simulator/new_sim_domain.cpp

Modified: openhpi/trunk/plugins/dynamic_simulator/new_sim_domain.cpp
===================================================================
--- openhpi/trunk/plugins/dynamic_simulator/new_sim_domain.cpp	2010-08-27 19:54:53 UTC (rev 7134)
+++ openhpi/trunk/plugins/dynamic_simulator/new_sim_domain.cpp	2010-08-28 13:19:32 UTC (rev 7135)
@@ -136,7 +136,7 @@
    stdlog << "DBG: VerifyRdr \n";
    for( int i = 0; i < m_resources.Num(); i++ ) {
       NewSimulatorResource *m_res = m_resources[i];
-      if ( m_res->FindRdr( rdr ) ) return rdr;
+      if ( m_res->FindRdr( rdr ) >= 0 ) return rdr;
    }
 
    return 0;
@@ -153,7 +153,7 @@
    stdlog << "DBG: VerifySensor \n";
    for( int i = 0; i < m_resources.Num(); i++ ) {
        NewSimulatorResource *m_res = m_resources[i];
-       if ( m_res->FindRdr( s ) ) return s;
+       if ( m_res->FindRdr( s ) >= 0 ) return s;
    }
 
    return 0;
@@ -169,7 +169,7 @@
   
    for( int i = 0; i < m_resources.Num(); i++ ) {
       NewSimulatorResource *m_res = m_resources[i];
-      if ( m_res->FindRdr( c ) ) return c;
+      if ( m_res->FindRdr( c ) >= 0 ) return c;
    }
 
    return 0;
@@ -186,7 +186,7 @@
    stdlog << "DBG: VerifyAnnunciator \n";
    for( int i = 0; i < m_resources.Num(); i++ ) {
        NewSimulatorResource *m_res = m_resources[i];
-       if ( m_res->FindRdr( a ) ) return a;
+       if ( m_res->FindRdr( a ) >= 0 ) return a;
    }
 
    return 0;
@@ -203,7 +203,7 @@
 
    for( int i = 0; i < m_resources.Num(); i++ ) {
       NewSimulatorResource *m_res = m_resources[i];
-      if ( m_res->FindRdr( c ) ) return c;
+      if ( m_res->FindRdr( c ) >= 0 ) return c;
    }
 
    return 0;
@@ -220,7 +220,7 @@
 
    for( int i = 0; i < m_resources.Num(); i++ ) {
       NewSimulatorResource *m_res = m_resources[i];
-      if ( m_res->FindRdr( f ) ) return f;
+      if ( m_res->FindRdr( f ) >= 0 ) return f;
    }
 
    return 0;
@@ -237,7 +237,7 @@
 
    for( int i = 0; i < m_resources.Num(); i++ ) {
       NewSimulatorResource *m_res = m_resources[i];
-      if ( m_res->FindRdr( d ) ) return d;
+      if ( m_res->FindRdr( d ) >= 0 ) return d;
    }
 
    return 0;
@@ -254,7 +254,7 @@
 
    for( int i = 0; i < m_resources.Num(); i++ ) {
       NewSimulatorResource *m_res = m_resources[i];
-      if ( m_res->FindRdr( inv ) ) return inv;
+      if ( m_res->FindRdr( inv ) >= 0 ) return inv;
    }
 
    return 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.