compbench-devel

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22203

Modified Files:
	CEL-Version.cpp 
Log Message:
Evaluate() renamed to evaluate();
More checks on input version string.

Index: CEL-Version.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Version.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CEL-Version.cpp	6 Mar 2007 19:31:15 -0000	1.2
--- CEL-Version.cpp	11 Mar 2007 18:49:10 -0000	1.3
***************
*** 41,51 ****
    digits=0;
  
!   while ( (cur=cbmSystem->Split(_version, ".", i))!="") {
!     tmp=atoi(cur.c_str());
!     internal+=tmp;
!     internal*=100;
!     mul*=100;
!     i++;
!     digits+=2;
    }
    internal/=100;
--- 41,54 ----
    digits=0;
  
!   
!   if (_version.find(".", 0)>0) {
!     while ( (cur=cbmSystem->Split(_version, ".", i))!="") {
!       tmp=atoi(cur.c_str());
!       internal+=tmp;
!       internal*=100;
!       mul*=100;
!       i++;
!       digits+=2;
!     }
    }
    internal/=100;
***************
*** 80,88 ****
    char c[16];
    /* sprintf(c, "%d", internal); */
!   sprintf(c, "%0*d", digits, internal);
!   x_version=c;
  }
  
! std::string CelVersion::Evaluate(void)
  {
    return(x_version);
--- 83,96 ----
    char c[16];
    /* sprintf(c, "%d", internal); */
! 
!   if (digits>0) {
!     sprintf(c, "%0*d", digits, internal);
!     x_version=c;
!   } else {
!     x_version="0";
!   }
  }
  
! std::string CelVersion::evaluate(void)
  {
    return(x_version);