[certi-cvs] certi/test/Billard Billard.cc

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      08/04/30 13:11:18

Modified files:
        test/Billard   : Billard.cc 

Log message:
        Fix bug #23116 : Resolve conflict between different changes
        Reversed to 3.29 will fix the compiler warning later

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/Billard.cc?cvsroot=certi&r1=3.31&r2=3.32

Patches:
Index: Billard.cc
===================================================================
RCS file: /sources/certi/certi/test/Billard/Billard.cc,v
retrieving revision 3.31
retrieving revision 3.32
diff -u -b -r3.31 -r3.32
--- Billard.cc  29 Apr 2008 09:59:06 -0000      3.31
+++ Billard.cc  30 Apr 2008 13:11:18 -0000      3.32
@@ -169,6 +169,7 @@
              cout << "Please enter a federate handle (zero means none)" << 
endl ;
              cout << "This federate will be synchronized with the creator and 
not the others" << endl;
              scanf("%d",&numfed);
+             if (numfed != 0)
                  {
                  // We store numfed into the federate set
                  federateSet->add(numfed) ;