[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-Autotools.cpp, 1.2, 1.3 Benchmark-BENCHPP.cpp, 1.2, 1.3 Benchmark.cpp, 1.8, 1.9 Benchmark-NBENCH.cpp, 1.2, 1.3 Benchmark-SCIMARK2.cpp, 1.3, 1.4 Benchmark-xZIP.cpp, 1.1, 1.2

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

Update of /cvsroot/compbench/CompBenchmarks++/Benchmark
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8076

Modified Files:
	Benchmark-Autotools.cpp Benchmark-BENCHPP.cpp Benchmark.cpp 
	Benchmark-NBENCH.cpp Benchmark-SCIMARK2.cpp Benchmark-xZIP.cpp 
Log Message:
Fixes possible compilation issues.

Index: Benchmark-BENCHPP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-BENCHPP.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-BENCHPP.cpp	18 Sep 2006 18:58:11 -0000	1.2
--- Benchmark-BENCHPP.cpp	25 Sep 2006 15:38:48 -0000	1.3
***************
*** 87,91 ****
  {
    std::string cmd;
!   std::string stdout;
    int         r;
    std::string patch;
--- 87,91 ----
  {
    std::string cmd;
!   std::string sstdout;
    int         r;
    std::string patch;
***************
*** 106,110 ****
    cmd+=CBM_PROG_PATCH;
    cmd+=" -p0 Configure";
!   r=system->exec(cmd, stdout);
    return(!r);
  }
--- 106,110 ----
    cmd+=CBM_PROG_PATCH;
    cmd+=" -p0 Configure";
!   r=system->exec(cmd, sstdout);
    return(!r);
  }
***************
*** 114,118 ****
    std::string localFile = localPackageAbsoluteName();
    std::string cmd;
!   std::string stdout;
  
    cmd+="cd ";
--- 114,118 ----
    std::string localFile = localPackageAbsoluteName();
    std::string cmd;
!   std::string sstdout;
  
    cmd+="cd ";
***************
*** 126,130 ****
    cmd+=" xvf -";
  
!   return(system->exec(cmd, stdout)==0);
  }
  
--- 126,130 ----
    cmd+=" xvf -";
  
!   return(system->exec(cmd, sstdout)==0);
  }
  
***************
*** 138,142 ****
  {
    std::string cmd;
!   std::string stdout;
  
    cmd="cd ";
--- 138,142 ----
  {
    std::string cmd;
!   std::string sstdout;
  
    cmd="cd ";
***************
*** 151,155 ****
    cmd+=" | ./Configure";
  
!   return(system->exec(cmd, stdout)==0);
  }
  
--- 151,155 ----
    cmd+=" | ./Configure";
  
!   return(system->exec(cmd, sstdout)==0);
  }
  
***************
*** 157,161 ****
  {
    std::string cmd;
!   std::string stdout;
  
    cmd="cd ";
--- 157,161 ----
  {
    std::string cmd;
!   std::string sstdout;
  
    cmd="cd ";
***************
*** 189,193 ****
    cmd+="' 2> /dev/null";
  
!   return(system->exec(cmd, stdout)==0);
  }
  
--- 189,193 ----
    cmd+="' 2> /dev/null";
  
!   return(system->exec(cmd, sstdout)==0);
  }
  
***************
*** 219,223 ****
  {
    std::string cmd;
!   std::string stdout;
  
    cmd="cd ";
--- 219,223 ----
  {
    std::string cmd;
!   std::string sstdout;
  
    cmd="cd ";
***************
*** 227,231 ****
    cmd+=" clean 2> /dev/null";
  
!   return(system->exec(cmd, stdout)==0);
  }
  
--- 227,231 ----
    cmd+=" clean 2> /dev/null";
  
!   return(system->exec(cmd, sstdout)==0);
  }
  

Index: Benchmark-NBENCH.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-NBENCH.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-NBENCH.cpp	10 Sep 2006 20:44:55 -0000	1.2
--- Benchmark-NBENCH.cpp	25 Sep 2006 15:38:51 -0000	1.3
***************
*** 89,93 ****
    std::string localFile = localPackageAbsoluteName();
    std::string cmd;
!   std::string stdout;
  
    cmd+="cd ";
--- 89,93 ----
    std::string localFile = localPackageAbsoluteName();
    std::string cmd;
!   std::string sstdout;
  
    cmd+="cd ";
***************
*** 101,105 ****
    cmd+=" xvf -";
  
!   return(system->exec(cmd, stdout)==0);
  }
  
--- 101,105 ----
    cmd+=" xvf -";
  
!   return(system->exec(cmd, sstdout)==0);
  }
  
***************
*** 119,123 ****
  {
    std::string cmd;
!   std::string stdout;
  
    cmd="cd ";
--- 119,123 ----
  {
    std::string cmd;
!   std::string sstdout;
  
    cmd="cd ";
***************
*** 151,155 ****
    cmd+="'";
  
!   return(system->exec(cmd, stdout)==0);
  }
  
--- 151,155 ----
    cmd+="'";
  
!   return(system->exec(cmd, sstdout)==0);
  }
  
***************
*** 180,184 ****
  {
    std::string cmd;
!   std::string stdout;
  
    cmd="cd ";
--- 180,184 ----
  {
    std::string cmd;
!   std::string sstdout;
  
    cmd="cd ";
***************
*** 188,192 ****
    cmd+=" clean 2> /dev/null";
  
!   return(system->exec(cmd, stdout)==0);
  }
  
--- 188,192 ----
    cmd+=" clean 2> /dev/null";
  
!   return(system->exec(cmd, sstdout)==0);
  }
  

Index: Benchmark-xZIP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-xZIP.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-xZIP.cpp	10 Sep 2006 20:43:39 -0000	1.1
--- Benchmark-xZIP.cpp	25 Sep 2006 15:38:51 -0000	1.2
***************
*** 34,38 ****
    std::string cmd;
    std::string result;
!   std::string stdout;
    char dum[16] = { 0 };
  
--- 34,38 ----
    std::string cmd;
    std::string result;
!   std::string sstdout;
    char dum[16] = { 0 };
  
***************
*** 45,49 ****
    cmd+="c Compbenchmarks.dat > /dev/null";
  
!   if (system->exec(cmd, stdout)==0) {
      end=system->Time();
      sprintf(dum, "%0.0f", ((float)benchmarkSize())/((int)(end-start)));
--- 45,49 ----
    cmd+="c Compbenchmarks.dat > /dev/null";
  
!   if (system->exec(cmd, sstdout)==0) {
      end=system->Time();
      sprintf(dum, "%0.0f", ((float)benchmarkSize())/((int)(end-start)));

Index: Benchmark.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Benchmark.cpp	24 Sep 2006 16:30:00 -0000	1.8
--- Benchmark.cpp	25 Sep 2006 15:38:51 -0000	1.9
***************
*** 77,85 ****
    cmd+=CBM_PROG_RM;
    cmd+=" -rf ";
!   std::string stdout;
  
    cmd+=where;
  
!   return(system->exec(cmd, stdout)==0);
    
  }
--- 77,85 ----
    cmd+=CBM_PROG_RM;
    cmd+=" -rf ";
!   std::string sstdout;
  
    cmd+=where;
  
!   return(system->exec(cmd, sstdout)==0);
    
  }

Index: Benchmark-SCIMARK2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-SCIMARK2.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-SCIMARK2.cpp	14 Sep 2006 17:41:46 -0000	1.3
--- Benchmark-SCIMARK2.cpp	25 Sep 2006 15:38:51 -0000	1.4
***************
*** 72,76 ****
  {
    std::string cmd;
!   std::string stdout;
    int         r;
    std::string patch;
--- 72,76 ----
  {
    std::string cmd;
!   std::string sstdout;
    int         r;
    std::string patch;
***************
*** 91,95 ****
    cmd+=CBM_PROG_PATCH;
    cmd+=" -p0 scimark2.c";
!   r=system->exec(cmd, stdout);
    return(!r);
  }
--- 91,95 ----
    cmd+=CBM_PROG_PATCH;
    cmd+=" -p0 scimark2.c";
!   r=system->exec(cmd, sstdout);
    return(!r);
  }
***************
*** 99,103 ****
    std::string localFile = localPackageAbsoluteName();
    std::string cmd;
!   std::string stdout;
  
    cmd+="cd ";
--- 99,103 ----
    std::string localFile = localPackageAbsoluteName();
    std::string cmd;
!   std::string sstdout;
  
    cmd+="cd ";
***************
*** 116,120 ****
    cmd+=localPackageName();
  
!   return(system->exec(cmd, stdout)==0);
  }
  
--- 116,120 ----
    cmd+=localPackageName();
  
!   return(system->exec(cmd, sstdout)==0);
  }
  
***************
*** 133,137 ****
  {
    std::string cmd;
!   std::string stdout;
  
    cmd="cd ";
--- 133,137 ----
  {
    std::string cmd;
!   std::string sstdout;
  
    cmd="cd ";
***************
*** 165,169 ****
    cmd+="'";
  
!   return(system->exec(cmd, stdout)==0);
  }
  
--- 165,169 ----
    cmd+="'";
  
!   return(system->exec(cmd, sstdout)==0);
  }
  
***************
*** 195,199 ****
  {
    std::string cmd;
!   std::string stdout;
  
    cmd="cd ";
--- 195,199 ----
  {
    std::string cmd;
!   std::string sstdout;
  
    cmd="cd ";
***************
*** 203,207 ****
    cmd+=" clean 2> /dev/null";
  
!   return(system->exec(cmd, stdout)==0);
  }
  
--- 203,207 ----
    cmd+=" clean 2> /dev/null";
  
!   return(system->exec(cmd, sstdout)==0);
  }
  

Index: Benchmark-Autotools.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-Autotools.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-Autotools.cpp	10 Sep 2006 20:42:44 -0000	1.2
--- Benchmark-Autotools.cpp	25 Sep 2006 15:38:48 -0000	1.3
***************
*** 15,19 ****
    std::string localFile = localPackageAbsoluteName();
    std::string cmd;
!   std::string stdout;
  
    cmd+="cd ";
--- 15,19 ----
    std::string localFile = localPackageAbsoluteName();
    std::string cmd;
!   std::string sstdout;
  
    cmd+="cd ";
***************
*** 27,31 ****
    cmd+=" xvf -";
  
!   return(system->exec(cmd, stdout)==0);
  }
  
--- 27,31 ----
    cmd+=" xvf -";
  
!   return(system->exec(cmd, sstdout)==0);
  }
  
***************
*** 35,39 ****
  {
    std::string cmd;
!   std::string stdout;
  
    cmd="cd ";
--- 35,39 ----
  {
    std::string cmd;
!   std::string sstdout;
  
    cmd="cd ";
***************
*** 69,73 ****
    cmd+=" ./configure";
  
!   return(system->exec(cmd, stdout)==0);
  }
  
--- 69,73 ----
    cmd+=" ./configure";
  
!   return(system->exec(cmd, sstdout)==0);
  }
  
***************
*** 75,79 ****
  {
    std::string cmd;
!   std::string stdout;
  
    cmd="cd ";
--- 75,79 ----
  {
    std::string cmd;
!   std::string sstdout;
  
    cmd="cd ";
***************
*** 83,87 ****
    cmd+=" 2> /dev/null";
  
!   return(system->exec(cmd, stdout)==0);
  }
  
--- 83,87 ----
    cmd+=" 2> /dev/null";
  
!   return(system->exec(cmd, sstdout)==0);
  }
  
***************
*** 89,93 ****
  {
    std::string cmd;
!   std::string stdout;
  
    cmd="cd ";
--- 89,93 ----
  {
    std::string cmd;
!   std::string sstdout;
  
    cmd="cd ";
***************
*** 97,101 ****
    cmd+=" clean 2> /dev/null";
  
!   return(system->exec(cmd, stdout)==0);
  }
  
--- 97,101 ----
    cmd+=" clean 2> /dev/null";
  
!   return(system->exec(cmd, sstdout)==0);
  }