[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BENCHPP.cpp, 1.5, 1.6 Benchmark-BENCHPP.h, 1.5, 1.6 Benchmark-BENCHPPLINUX.cpp, 1.8, 1.9 Benchmark-BENCHPPLINUX.h, 1.5, 1.6 Benchmark-BZIP2.cpp, 1.6, 1.7 Benchmark-BZIP2.h, 1.6, 1.7 Benchmark-GZIP.cpp, 1.6, 1.7 Benchmark-GZIP.h, 1.5, 1.6 Benchmark-LINPACKC.cpp, 1.9, 1.10 Benchmark-LINPACKC.h, 1.7, 1.8 Benchmark-NBENCH.cpp, 1.4, 1.5 Benchmark-NBENCH.h, 1.5, 1.6 Benchmark-SCIMARK2.cpp, 1.5, 1.6 Benchmark-SCIMARK2.h, 1.5, 1.6

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

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

Modified Files:
	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h 
	Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h 
	Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-GZIP.cpp 
	Benchmark-GZIP.h Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h 
	Benchmark-NBENCH.cpp Benchmark-NBENCH.h Benchmark-SCIMARK2.cpp 
	Benchmark-SCIMARK2.h 
Log Message:
API changes on CBM::Benchmark

Index: Benchmark-BENCHPP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark-BENCHPP.cpp	21 Jan 2007 21:16:49 -0000	1.5
--- Benchmark-BENCHPP.cpp	21 Jan 2007 21:27:37 -0000	1.6
***************
*** 231,235 ****
  }
  
! std::string BenchmarkBENCHPP::benchmarkComments(void)
  {
    std::string comment;
--- 231,235 ----
  }
  
! std::string BenchmarkBENCHPP::Comments(void)
  {
    std::string comment;
***************
*** 273,277 ****
  }
  
! std::string BenchmarkBENCHPP_DHRYSTONE::benchmarkName(void)
  {
    return("benchpp-dhrystone");
--- 273,277 ----
  }
  
! std::string BenchmarkBENCHPP_DHRYSTONE::Name(void)
  {
    return("benchpp-dhrystone");
***************
*** 297,301 ****
  }
  
! std::string BenchmarkBENCHPP_WHETSTONE::benchmarkName(void)
  {
    return("benchpp-whetstone");
--- 297,301 ----
  }
  
! std::string BenchmarkBENCHPP_WHETSTONE::Name(void)
  {
    return("benchpp-whetstone");
***************
*** 353,357 ****
  }
  
! std::string BenchmarkBENCHPP_STEPANOV_AL12::benchmarkName(void)
  {
    return("benchpp-stepanov-al12");
--- 353,357 ----
  }
  
! std::string BenchmarkBENCHPP_STEPANOV_AL12::Name(void)
  {
    return("benchpp-stepanov-al12");

Index: Benchmark-NBENCH.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark-NBENCH.h	21 Jan 2007 21:16:33 -0000	1.5
--- Benchmark-NBENCH.h	21 Jan 2007 21:27:37 -0000	1.6
***************
*** 65,69 ****
      virtual int nbyteWriteDatFile(void);
  
!     virtual std::string benchmarkComments(void);
      virtual std::string nbyteBenchmark(void) = 0;
      virtual std::string nbyteBenchmarkLabel(void) = 0;
--- 65,69 ----
      virtual int nbyteWriteDatFile(void);
  
!     virtual std::string Comments(void);
      virtual std::string nbyteBenchmark(void) = 0;
      virtual std::string nbyteBenchmarkLabel(void) = 0;
***************
*** 81,85 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkNBENCHComments(void);
  
--- 81,85 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkNBENCHComments(void);
  
***************
*** 97,101 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkNBENCHComments(void);
  
--- 97,101 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkNBENCHComments(void);
  
***************
*** 113,117 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkNBENCHComments(void);
  
--- 113,117 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkNBENCHComments(void);
  
***************
*** 129,133 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkNBENCHComments(void);
  
--- 129,133 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkNBENCHComments(void);
  
***************
*** 145,149 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkNBENCHComments(void);
  
--- 145,149 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkNBENCHComments(void);
  
***************
*** 161,165 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkNBENCHComments(void);
  
--- 161,165 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkNBENCHComments(void);
  
***************
*** 177,181 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkNBENCHComments(void);
  
--- 177,181 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkNBENCHComments(void);
  
***************
*** 193,197 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkNBENCHComments(void);
  
--- 193,197 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkNBENCHComments(void);
  
***************
*** 209,213 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkNBENCHComments(void);
  
--- 209,213 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkNBENCHComments(void);
  
***************
*** 225,229 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkNBENCHComments(void);
  
--- 225,229 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkNBENCHComments(void);
  

Index: Benchmark-LINPACKC.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Benchmark-LINPACKC.h	21 Jan 2007 21:16:33 -0000	1.7
--- Benchmark-LINPACKC.h	21 Jan 2007 21:27:37 -0000	1.8
***************
*** 56,60 ****
    protected:
      BenchmarkLINPACKC(CBM::Package *_package);
!     virtual std::string benchmarkComments(void);
      virtual std::string benchmarkLINPACKCComments(void) = 0;
  
--- 56,60 ----
    protected:
      BenchmarkLINPACKC(CBM::Package *_package);
!     virtual std::string Comments(void);
      virtual std::string benchmarkLINPACKCComments(void) = 0;
  
***************
*** 75,79 ****
      BenchmarkLINPACKC_SP_UNROLL(CBM::Package *_package);
  
!     virtual std::string benchmarkName(void);
  
      virtual ~BenchmarkLINPACKC_SP_UNROLL();
--- 75,79 ----
      BenchmarkLINPACKC_SP_UNROLL(CBM::Package *_package);
  
!     virtual std::string Name(void);
  
      virtual ~BenchmarkLINPACKC_SP_UNROLL();
***************
*** 92,96 ****
      BenchmarkLINPACKC_SP_ROLL(CBM::Package *_package);
  
!     virtual std::string benchmarkName(void);
  
      virtual ~BenchmarkLINPACKC_SP_ROLL();
--- 92,96 ----
      BenchmarkLINPACKC_SP_ROLL(CBM::Package *_package);
  
!     virtual std::string Name(void);
  
      virtual ~BenchmarkLINPACKC_SP_ROLL();
***************
*** 110,114 ****
      BenchmarkLINPACKC_DP_UNROLL(CBM::Package *_package);
  
!     virtual std::string benchmarkName(void);
  
      virtual ~BenchmarkLINPACKC_DP_UNROLL();
--- 110,114 ----
      BenchmarkLINPACKC_DP_UNROLL(CBM::Package *_package);
  
!     virtual std::string Name(void);
  
      virtual ~BenchmarkLINPACKC_DP_UNROLL();
***************
*** 127,131 ****
      BenchmarkLINPACKC_DP_ROLL(CBM::Package *_package);
  
!     virtual std::string benchmarkName(void);
  
      virtual ~BenchmarkLINPACKC_DP_ROLL();
--- 127,131 ----
      BenchmarkLINPACKC_DP_ROLL(CBM::Package *_package);
  
!     virtual std::string Name(void);
  
      virtual ~BenchmarkLINPACKC_DP_ROLL();

Index: Benchmark-SCIMARK2.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark-SCIMARK2.h	21 Jan 2007 21:16:34 -0000	1.5
--- Benchmark-SCIMARK2.h	21 Jan 2007 21:27:37 -0000	1.6
***************
*** 64,69 ****
    protected:
      BenchmarkSCIMARK2(CBM::Package *_package);
!     virtual std::string benchmarkComments(void);
!     virtual std::string benchmarkName(void) = 0;
      virtual std::string benchmarkSCIMARK2Comments(void) = 0;
      virtual std::string scimark2BenchmarkLabel(void) = 0;
--- 64,69 ----
    protected:
      BenchmarkSCIMARK2(CBM::Package *_package);
!     virtual std::string Comments(void);
!     virtual std::string Name(void) = 0;
      virtual std::string benchmarkSCIMARK2Comments(void) = 0;
      virtual std::string scimark2BenchmarkLabel(void) = 0;
***************
*** 78,82 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkSCIMARK2Comments(void);
  
--- 78,82 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkSCIMARK2Comments(void);
  
***************
*** 93,97 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkSCIMARK2Comments(void);
  
--- 93,97 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkSCIMARK2Comments(void);
  
***************
*** 108,112 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkSCIMARK2Comments(void);
  
--- 108,112 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkSCIMARK2Comments(void);
  
***************
*** 123,127 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkSCIMARK2Comments(void);
  
--- 123,127 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkSCIMARK2Comments(void);
  
***************
*** 138,142 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkSCIMARK2Comments(void);
  
--- 138,142 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkSCIMARK2Comments(void);
  

Index: Benchmark-NBENCH.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Benchmark-NBENCH.cpp	21 Jan 2007 21:16:33 -0000	1.4
--- Benchmark-NBENCH.cpp	21 Jan 2007 21:27:37 -0000	1.5
***************
*** 190,194 ****
  }
  
! std::string BenchmarkNBENCH::benchmarkComments(void)
  {
    std::string comment;
--- 190,194 ----
  }
  
! std::string BenchmarkNBENCH::Comments(void)
  {
    std::string comment;
***************
*** 237,241 ****
  }
  
! std::string BenchmarkNBENCH_NUMSORT::benchmarkName(void)
  {
    return("nbench-numsort");
--- 237,241 ----
  }
  
! std::string BenchmarkNBENCH_NUMSORT::Name(void)
  {
    return("nbench-numsort");
***************
*** 270,274 ****
  }
  
! std::string BenchmarkNBENCH_STRINGSORT::benchmarkName(void)
  {
    return("nbench-stringsort");
--- 270,274 ----
  }
  
! std::string BenchmarkNBENCH_STRINGSORT::Name(void)
  {
    return("nbench-stringsort");
***************
*** 307,311 ****
  }
  
! std::string BenchmarkNBENCH_BITFIELD::benchmarkName(void)
  {
    return("nbench-bitfield");
--- 307,311 ----
  }
  
! std::string BenchmarkNBENCH_BITFIELD::Name(void)
  {
    return("nbench-bitfield");
***************
*** 343,347 ****
  }
  
! std::string BenchmarkNBENCH_EMF::benchmarkName(void)
  {
    return("nbench-emf");
--- 343,347 ----
  }
  
! std::string BenchmarkNBENCH_EMF::Name(void)
  {
    return("nbench-emf");
***************
*** 374,378 ****
  }
  
! std::string BenchmarkNBENCH_FOURIER::benchmarkName(void)
  {
    return("nbench-fourier");
--- 374,378 ----
  }
  
! std::string BenchmarkNBENCH_FOURIER::Name(void)
  {
    return("nbench-fourier");
***************
*** 408,412 ****
  }
  
! std::string BenchmarkNBENCH_ASSIGN::benchmarkName(void)
  {
    return("nbench-assign");
--- 408,412 ----
  }
  
! std::string BenchmarkNBENCH_ASSIGN::Name(void)
  {
    return("nbench-assign");
***************
*** 446,450 ****
  }
  
! std::string BenchmarkNBENCH_HUFFMAN::benchmarkName(void)
  {
    return("nbench-huffman");
--- 446,450 ----
  }
  
! std::string BenchmarkNBENCH_HUFFMAN::Name(void)
  {
    return("nbench-huffman");
***************
*** 478,482 ****
  }
  
! std::string BenchmarkNBENCH_IDEA::benchmarkName(void)
  {
    return("nbench-idea");
--- 478,482 ----
  }
  
! std::string BenchmarkNBENCH_IDEA::Name(void)
  {
    return("nbench-idea");
***************
*** 509,513 ****
  }
  
! std::string BenchmarkNBENCH_NNET::benchmarkName(void)
  {
    return("nbench-nnet");
--- 509,513 ----
  }
  
! std::string BenchmarkNBENCH_NNET::Name(void)
  {
    return("nbench-nnet");
***************
*** 543,547 ****
  }
  
! std::string BenchmarkNBENCH_LU::benchmarkName(void)
  {
    return("nbench-lu");
--- 543,547 ----
  }
  
! std::string BenchmarkNBENCH_LU::Name(void)
  {
    return("nbench-lu");

Index: Benchmark-GZIP.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark-GZIP.h	21 Jan 2007 21:16:33 -0000	1.5
--- Benchmark-GZIP.h	21 Jan 2007 21:27:37 -0000	1.6
***************
*** 64,72 ****
    protected:
      virtual char*       compressionLevel(void);
!     virtual std::string benchmarkComments(void);
  
    public:
      BenchmarkGZIP1(CBM::Package *_package);
!     virtual std::string benchmarkName(void);
      virtual ~BenchmarkGZIP1();
    };
--- 64,72 ----
    protected:
      virtual char*       compressionLevel(void);
!     virtual std::string Comments(void);
  
    public:
      BenchmarkGZIP1(CBM::Package *_package);
!     virtual std::string Name(void);
      virtual ~BenchmarkGZIP1();
    };
***************
*** 78,87 ****
    protected:
      virtual char*       compressionLevel(void);
!     virtual std::string benchmarkComments(void);
    public:
  
      BenchmarkGZIP9(CBM::Package *_package);
  
!     virtual std::string benchmarkName(void);
      virtual ~BenchmarkGZIP9();
    };
--- 78,87 ----
    protected:
      virtual char*       compressionLevel(void);
!     virtual std::string Comments(void);
    public:
  
      BenchmarkGZIP9(CBM::Package *_package);
  
!     virtual std::string Name(void);
      virtual ~BenchmarkGZIP9();
    };

Index: Benchmark-BENCHPPLINUX.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark-BENCHPPLINUX.h	21 Jan 2007 21:16:33 -0000	1.5
--- Benchmark-BENCHPPLINUX.h	21 Jan 2007 21:27:37 -0000	1.6
***************
*** 66,71 ****
  
      virtual std::string bench(void);
!     virtual std::string benchmarkComments(void);
!     virtual std::string benchmarkName(void) = 0;
      virtual std::string benchppBenchmark(void) = 0;
      virtual std::string benchmarkBENCHPPLINUXComments(void) = 0;
--- 66,71 ----
  
      virtual std::string bench(void);
!     virtual std::string Comments(void);
!     virtual std::string Name(void) = 0;
      virtual std::string benchppBenchmark(void) = 0;
      virtual std::string benchmarkBENCHPPLINUXComments(void) = 0;
***************
*** 79,83 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 79,83 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 95,99 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 95,99 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 123,127 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 123,127 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 140,144 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 140,144 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 157,161 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 157,161 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 175,179 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 175,179 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 193,197 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 193,197 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 211,215 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 211,215 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 228,232 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 228,232 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 245,249 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 245,249 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 262,266 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 262,266 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 279,283 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 279,283 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 296,300 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 296,300 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 313,317 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 313,317 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 330,334 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 330,334 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 347,351 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 347,351 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 364,368 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 364,368 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 381,385 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 381,385 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 399,403 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 399,403 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 416,420 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 416,420 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 433,437 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 433,437 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 450,454 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 450,454 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 467,471 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 467,471 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 484,488 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 484,488 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 501,505 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 501,505 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 518,522 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 518,522 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 535,539 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 535,539 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 552,556 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 552,556 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 569,573 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 569,573 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 586,590 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 586,590 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 604,608 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 604,608 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 621,625 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 621,625 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 639,643 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 639,643 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 656,660 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 656,660 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
***************
*** 673,677 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  
--- 673,677 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPLINUXComments(void);
  

Index: Benchmark-BZIP2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Benchmark-BZIP2.cpp	21 Jan 2007 21:16:33 -0000	1.6
--- Benchmark-BZIP2.cpp	21 Jan 2007 21:27:37 -0000	1.7
***************
*** 166,170 ****
  }
  
! std::string BenchmarkBZIP21::benchmarkName(void)
  {
    return("bzip2-1c");
--- 166,170 ----
  }
  
! std::string BenchmarkBZIP21::Name(void)
  {
    return("bzip2-1c");
***************
*** 176,180 ****
  }
  
! std::string BenchmarkBZIP21::benchmarkComments(void)
  {
    return("Uses generated bzip2 binary with fastest compression");
--- 176,180 ----
  }
  
! std::string BenchmarkBZIP21::Comments(void)
  {
    return("Uses generated bzip2 binary with fastest compression");
***************
*** 190,194 ****
  }
  
! std::string BenchmarkBZIP29::benchmarkName(void)
  {
    return("bzip2-9c");
--- 190,194 ----
  }
  
! std::string BenchmarkBZIP29::Name(void)
  {
    return("bzip2-9c");
***************
*** 200,204 ****
  }
  
! std::string BenchmarkBZIP29::benchmarkComments(void)
  {
    return("Uses generated bzip2 binary with maximum compression");
--- 200,204 ----
  }
  
! std::string BenchmarkBZIP29::Comments(void)
  {
    return("Uses generated bzip2 binary with maximum compression");

Index: Benchmark-GZIP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Benchmark-GZIP.cpp	21 Jan 2007 21:16:33 -0000	1.6
--- Benchmark-GZIP.cpp	21 Jan 2007 21:27:37 -0000	1.7
***************
*** 124,128 ****
  }
  
! std::string BenchmarkGZIP1::benchmarkName(void)
  {
    return("gzip-1c");
--- 124,128 ----
  }
  
! std::string BenchmarkGZIP1::Name(void)
  {
    return("gzip-1c");
***************
*** 134,138 ****
  }
  
! std::string BenchmarkGZIP1::benchmarkComments(void)
  {
    return("Uses generated gzip binary with fastest compression");
--- 134,138 ----
  }
  
! std::string BenchmarkGZIP1::Comments(void)
  {
    return("Uses generated gzip binary with fastest compression");
***************
*** 148,152 ****
  }
  
! std::string BenchmarkGZIP9::benchmarkName(void)
  {
    return("gzip-9c");
--- 148,152 ----
  }
  
! std::string BenchmarkGZIP9::Name(void)
  {
    return("gzip-9c");
***************
*** 158,162 ****
  }
  
! std::string BenchmarkGZIP9::benchmarkComments(void)
  {
    return("Uses generated gzip binary with maximum compression");
--- 158,162 ----
  }
  
! std::string BenchmarkGZIP9::Comments(void)
  {
    return("Uses generated gzip binary with maximum compression");

Index: Benchmark-BENCHPP.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark-BENCHPP.h	21 Jan 2007 21:16:49 -0000	1.5
--- Benchmark-BENCHPP.h	21 Jan 2007 21:27:37 -0000	1.6
***************
*** 65,71 ****
    protected:
      BenchmarkBENCHPP(CBM::Package *_package);
!     virtual std::string benchmarkComments(void);
      virtual std::string benchmarkBENCHPPComments(void) = 0;
!     virtual std::string benchmarkName(void) = 0;
      virtual std::string benchppBenchmark(void) = 0;
      virtual std::string bench(void);
--- 65,71 ----
    protected:
      BenchmarkBENCHPP(CBM::Package *_package);
!     virtual std::string Comments(void);
      virtual std::string benchmarkBENCHPPComments(void) = 0;
!     virtual std::string Name(void) = 0;
      virtual std::string benchppBenchmark(void) = 0;
      virtual std::string bench(void);
***************
*** 78,82 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPComments(void);
  
--- 78,82 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPComments(void);
  
***************
*** 94,98 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPComments(void);
  
--- 94,98 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPComments(void);
  
***************
*** 121,125 ****
    {
    protected:
!     virtual std::string benchmarkName(void);
      virtual std::string benchmarkBENCHPPComments(void);
  
--- 121,125 ----
    {
    protected:
!     virtual std::string Name(void);
      virtual std::string benchmarkBENCHPPComments(void);
  

Index: Benchmark-SCIMARK2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark-SCIMARK2.cpp	21 Jan 2007 21:16:33 -0000	1.5
--- Benchmark-SCIMARK2.cpp	21 Jan 2007 21:27:37 -0000	1.6
***************
*** 213,217 ****
  }
  
! std::string BenchmarkSCIMARK2::benchmarkComments(void)
  {
    std::string comment;
--- 213,217 ----
  }
  
! std::string BenchmarkSCIMARK2::Comments(void)
  {
    std::string comment;
***************
*** 257,261 ****
  }
  
! std::string BenchmarkSCIMARK2_FOURIER::benchmarkName(void)
  {
    return("scimark2-fourier");
--- 257,261 ----
  }
  
! std::string BenchmarkSCIMARK2_FOURIER::Name(void)
  {
    return("scimark2-fourier");
***************
*** 289,293 ****
  }
  
! std::string BenchmarkSCIMARK2_SOR::benchmarkName(void)
  {
    return("scimark2-sor");
--- 289,293 ----
  }
  
! std::string BenchmarkSCIMARK2_SOR::Name(void)
  {
    return("scimark2-sor");
***************
*** 321,325 ****
  }
  
! std::string BenchmarkSCIMARK2_MC::benchmarkName(void)
  {
    return("scimark2-mc");
--- 321,325 ----
  }
  
! std::string BenchmarkSCIMARK2_MC::Name(void)
  {
    return("scimark2-mc");
***************
*** 353,357 ****
  }
  
! std::string BenchmarkSCIMARK2_SMM::benchmarkName(void)
  {
    return("scimark2-smm");
--- 353,357 ----
  }
  
! std::string BenchmarkSCIMARK2_SMM::Name(void)
  {
    return("scimark2-smm");
***************
*** 382,386 ****
  }
  
! std::string BenchmarkSCIMARK2_LU::benchmarkName(void)
  {
    return("scimark2-lu");
--- 382,386 ----
  }
  
! std::string BenchmarkSCIMARK2_LU::Name(void)
  {
    return("scimark2-lu");

Index: Benchmark-LINPACKC.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Benchmark-LINPACKC.cpp	21 Jan 2007 21:16:33 -0000	1.9
--- Benchmark-LINPACKC.cpp	21 Jan 2007 21:27:37 -0000	1.10
***************
*** 96,100 ****
  }
  
! std::string BenchmarkLINPACKC::benchmarkComments(void)
  {
    std::string comment;
--- 96,100 ----
  }
  
! std::string BenchmarkLINPACKC::Comments(void)
  {
    std::string comment;
***************
*** 116,120 ****
    cmd+=" && echo $(";
    cmd+="./";
!   cmd+=benchmarkName();
    cmd+=" 2>&1 | ";
    cmd+=CBM_PROG_GREP;
--- 116,120 ----
    cmd+=" && echo $(";
    cmd+="./";
!   cmd+=Name();
    cmd+=" 2>&1 | ";
    cmd+=CBM_PROG_GREP;
***************
*** 140,144 ****
  }
  
! std::string BenchmarkLINPACKC_SP_UNROLL::benchmarkName(void)
  {
    return("linpackc-sp-unroll");
--- 140,144 ----
  }
  
! std::string BenchmarkLINPACKC_SP_UNROLL::Name(void)
  {
    return("linpackc-sp-unroll");
***************
*** 160,164 ****
  }
  
! std::string BenchmarkLINPACKC_SP_ROLL::benchmarkName(void)
  {
    return("linpackc-sp-roll");
--- 160,164 ----
  }
  
! std::string BenchmarkLINPACKC_SP_ROLL::Name(void)
  {
    return("linpackc-sp-roll");
***************
*** 180,184 ****
  }
  
! std::string BenchmarkLINPACKC_DP_UNROLL::benchmarkName(void)
  {
    return("linpackc-dp-unroll");
--- 180,184 ----
  }
  
! std::string BenchmarkLINPACKC_DP_UNROLL::Name(void)
  {
    return("linpackc-dp-unroll");
***************
*** 199,203 ****
  {
  }
! std::string BenchmarkLINPACKC_DP_ROLL::benchmarkName(void)
  {
    return("linpackc-dp-roll");
--- 199,203 ----
  {
  }
! std::string BenchmarkLINPACKC_DP_ROLL::Name(void)
  {
    return("linpackc-dp-roll");

Index: Benchmark-BENCHPPLINUX.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Benchmark-BENCHPPLINUX.cpp	21 Jan 2007 21:16:49 -0000	1.8
--- Benchmark-BENCHPPLINUX.cpp	21 Jan 2007 21:27:37 -0000	1.9
***************
*** 208,212 ****
  }
  
! std::string BenchmarkBENCHPPLINUX::benchmarkComments(void)
  {
    std::string comment;
--- 208,212 ----
  }
  
! std::string BenchmarkBENCHPPLINUX::Comments(void)
  {
    std::string comment;
***************
*** 231,235 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_DHRYSTONE::benchmarkName(void)
  {
    return("benchpplinux-dhrystone");
--- 231,235 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_DHRYSTONE::Name(void)
  {
    return("benchpplinux-dhrystone");
***************
*** 255,259 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_WHETSTONE::benchmarkName(void)
  {
    return("benchpplinux-whetstone");
--- 255,259 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_WHETSTONE::Name(void)
  {
    return("benchpplinux-whetstone");
***************
*** 326,330 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_BOOL_ASSIGN::benchmarkName(void)
  {
    return("benchpplinux-bool-assign");
--- 326,330 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_BOOL_ASSIGN::Name(void)
  {
    return("benchpplinux-bool-assign");
***************
*** 351,355 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_BOOL_IF::benchmarkName(void)
  {
    return("benchpplinux-bool-if");
--- 351,355 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_BOOL_IF::Name(void)
  {
    return("benchpplinux-bool-if");
***************
*** 376,380 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_2WAY_IFELSE::benchmarkName(void)
  {
    return("benchpplinux-2wifelse");
--- 376,380 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_2WAY_IFELSE::Name(void)
  {
    return("benchpplinux-2wifelse");
***************
*** 400,404 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_2WAY_SWITCH::benchmarkName(void)
  {
    return("benchpplinux-2wswitch");
--- 400,404 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_2WAY_SWITCH::Name(void)
  {
    return("benchpplinux-2wswitch");
***************
*** 424,428 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_10WAY_IFELSE::benchmarkName(void)
  {
    return("benchpplinux-10wifelse");
--- 424,428 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_10WAY_IFELSE::Name(void)
  {
    return("benchpplinux-10wifelse");
***************
*** 448,452 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_10WAY_SWITCH::benchmarkName(void)
  {
    return("benchpplinux-10wswitch");
--- 448,452 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_10WAY_SWITCH::Name(void)
  {
    return("benchpplinux-10wswitch");
***************
*** 473,477 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH::benchmarkName(void)
  {
    return("benchpplinux-10wsparseswitch");
--- 473,477 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_10WAY_SPARSE_SWITCH::Name(void)
  {
    return("benchpplinux-10wsparseswitch");
***************
*** 497,501 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_10WAY_VFC::benchmarkName(void)
  {
    return("benchpplinux-10wvfc");
--- 497,501 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_10WAY_VFC::Name(void)
  {
    return("benchpplinux-10wvfc");
***************
*** 521,525 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_PACKEDBITARRAY::benchmarkName(void)
  {
    return("benchpplinux-packedbitarray");
--- 521,525 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_PACKEDBITARRAY::Name(void)
  {
    return("benchpplinux-packedbitarray");
***************
*** 545,549 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_BITFIELDS::benchmarkName(void)
  {
    return("benchpplinux-bitfields");
--- 545,549 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_BITFIELDS::Name(void)
  {
    return("benchpplinux-bitfields");
***************
*** 570,574 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_BITFIELDS_PBA::benchmarkName(void)
  {
    return("benchpplinux-bitfields-pba");
--- 570,574 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_BITFIELDS_PBA::Name(void)
  {
    return("benchpplinux-bitfields-pba");
***************
*** 596,600 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_PACKUNPACKOBJ::benchmarkName(void)
  {
    return("benchpplinux-packunpackobjets");
--- 596,600 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_PACKUNPACKOBJ::Name(void)
  {
    return("benchpplinux-packunpackobjets");
***************
*** 620,624 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_CONSTPROP::benchmarkName(void)
  {
    return("benchpplinux-constantpropagation");
--- 620,624 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_CONSTPROP::Name(void)
  {
    return("benchpplinux-constantpropagation");
***************
*** 644,648 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_CONSTPROP_HO::benchmarkName(void)
  {
    return("benchpplinux-constantpropagation-ho");
--- 644,648 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_CONSTPROP_HO::Name(void)
  {
    return("benchpplinux-constantpropagation-ho");
***************
*** 668,672 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_LOCALCSE::benchmarkName(void)
  {
    return("benchpplinux-localcommonse");
--- 668,672 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_LOCALCSE::Name(void)
  {
    return("benchpplinux-localcommonse");
***************
*** 692,696 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_LOCALCSE_HO::benchmarkName(void)
  {
    return("benchpplinux-localcommonse-ho");
--- 692,696 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_LOCALCSE_HO::Name(void)
  {
    return("benchpplinux-localcommonse-ho");
***************
*** 716,720 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_GLOBALCSE::benchmarkName(void)
  {
    return("benchpplinux-globalcommonse");
--- 716,720 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_GLOBALCSE::Name(void)
  {
    return("benchpplinux-globalcommonse");
***************
*** 740,744 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_GLOBALCSE_HO::benchmarkName(void)
  {
    return("benchpplinux-globalcommonse-ho");
--- 740,744 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_GLOBALCSE_HO::Name(void)
  {
    return("benchpplinux-globalcommonse-ho");
***************
*** 764,768 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_UNNECCOPY::benchmarkName(void)
  {
    return("benchpplinux-unneccopy");
--- 764,768 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_UNNECCOPY::Name(void)
  {
    return("benchpplinux-unneccopy");
***************
*** 788,792 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_UNNECCOPY_HO::benchmarkName(void)
  {
    return("benchpplinux-unneccopy-ho");
--- 788,792 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_UNNECCOPY_HO::Name(void)
  {
    return("benchpplinux-unneccopy-ho");
***************
*** 812,816 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_CODEMOTION::benchmarkName(void)
  {
    return("benchpplinux-codemotion");
--- 812,816 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_CODEMOTION::Name(void)
  {
    return("benchpplinux-codemotion");
***************
*** 836,840 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_CODEMOTION_HO::benchmarkName(void)
  {
    return("benchpplinux-codemotion-ho");
--- 836,840 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_CODEMOTION_HO::Name(void)
  {
    return("benchpplinux-codemotion-ho");
***************
*** 860,864 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_INDUCVAR::benchmarkName(void)
  {
    return("benchpplinux-inducvar");
--- 860,864 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_INDUCVAR::Name(void)
  {
    return("benchpplinux-inducvar");
***************
*** 884,888 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_INDUCVAR_HO::benchmarkName(void)
  {
    return("benchpplinux-inducvar-ho");
--- 884,888 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_INDUCVAR_HO::Name(void)
  {
    return("benchpplinux-inducvar-ho");
***************
*** 908,912 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO::benchmarkName(void)
  {
    return("benchpplinux-reducstrength-ho");
--- 908,912 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_REDUCSTRENGTH_HO::Name(void)
  {
    return("benchpplinux-reducstrength-ho");
***************
*** 932,936 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_DEADCODE::benchmarkName(void)
  {
    return("benchpplinux-deadcode");
--- 932,936 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_DEADCODE::Name(void)
  {
    return("benchpplinux-deadcode");
***************
*** 956,960 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_DEADCODE_HO::benchmarkName(void)
  {
    return("benchpplinux-deadcode-ho");
--- 956,960 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_DEADCODE_HO::Name(void)
  {
    return("benchpplinux-deadcode-ho");
***************
*** 981,985 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_LOOPJAMMING::benchmarkName(void)
  {
    return("benchpplinux-loopjamming");
--- 981,985 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_LOOPJAMMING::Name(void)
  {
    return("benchpplinux-loopjamming");
***************
*** 1005,1009 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_LOOPJAMMING_HO::benchmarkName(void)
  {
    return("benchpplinux-loopjamming-ho");
--- 1005,1009 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_LOOPJAMMING_HO::Name(void)
  {
    return("benchpplinux-loopjamming-ho");
***************
*** 1029,1033 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_REDUNCODE::benchmarkName(void)
  {
    return("benchpplinux-reduncode");
--- 1029,1033 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_REDUNCODE::Name(void)
  {
    return("benchpplinux-reduncode");
***************
*** 1053,1057 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_REDUNCODE_HO::benchmarkName(void)
  {
    return("benchpplinux-reduncode-ho");
--- 1053,1057 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_REDUNCODE_HO::Name(void)
  {
    return("benchpplinux-reduncode-ho");
***************
*** 1077,1081 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_STRINGOPS::benchmarkName(void)
  {
    return("benchpplinux-stringops");
--- 1077,1081 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_STRINGOPS::Name(void)
  {
    return("benchpplinux-stringops");
***************
*** 1101,1105 ****
  }
  
! std::string BenchmarkBENCHPPLINUX_STRINGOPS_HO::benchmarkName(void)
  {
    return("benchpplinux-stringops-ho");
--- 1101,1105 ----
  }
  
! std::string BenchmarkBENCHPPLINUX_STRINGOPS_HO::Name(void)
  {
    return("benchpplinux-stringops-ho");

Index: Benchmark-BZIP2.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Benchmark-BZIP2.h	21 Jan 2007 21:16:33 -0000	1.6
--- Benchmark-BZIP2.h	21 Jan 2007 21:27:37 -0000	1.7
***************
*** 71,79 ****
    protected:
      virtual char*       compressionLevel(void);
!     virtual std::string benchmarkComments(void);
  
    public:
      BenchmarkBZIP21(CBM::Package *_package);
!     virtual std::string benchmarkName(void);
      virtual ~BenchmarkBZIP21();
    };
--- 71,79 ----
    protected:
      virtual char*       compressionLevel(void);
!     virtual std::string Comments(void);
  
    public:
      BenchmarkBZIP21(CBM::Package *_package);
!     virtual std::string Name(void);
      virtual ~BenchmarkBZIP21();
    };
***************
*** 85,94 ****
    protected:
      virtual char*       compressionLevel(void);
!     virtual std::string benchmarkComments(void);
    public:
  
      BenchmarkBZIP29(CBM::Package *_package);
  
!     virtual std::string benchmarkName(void);
      virtual ~BenchmarkBZIP29();
    };
--- 85,94 ----
    protected:
      virtual char*       compressionLevel(void);
!     virtual std::string Comments(void);
    public:
  
      BenchmarkBZIP29(CBM::Package *_package);
  
!     virtual std::string Name(void);
      virtual ~BenchmarkBZIP29();
    };