[Compbench-devel] CompBenchmarks++ cloptions.cpp, 1.8, 1.9 cloptions.h, 1.3, 1.4 main.cpp, 1.5, 1.6

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

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

Modified Files:
	cloptions.cpp cloptions.h main.cpp 
Log Message:
Class name changed.

Index: cloptions.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** cloptions.cpp	10 Oct 2006 16:53:36 -0000	1.8
--- cloptions.cpp	1 Nov 2006 13:06:47 -0000	1.9
***************
*** 1,5 ****
  #include <cloptions.h>
  #include <Benchmark/Benchmark-Selector.h>
! #include <Benchmark/Compiler/BenchmarkContext-Compiler.h>
  #include <System/System.h>
  #include <UI/UI.h>
--- 1,5 ----
  #include <cloptions.h>
  #include <Benchmark/Benchmark-Selector.h>
! #include <Compiler/Compiler.h>
  #include <System/System.h>
  #include <UI/UI.h>
***************
*** 16,22 ****
  int parseExitValue = -1;
  
- int UO_enableTestSuite = 1;
- int UO_force = 0;
- 
  void cbmOptionsHelp(void)
  {
--- 16,19 ----
***************
*** 89,95 ****
    CBMBenchmark                        *B = 0;
    
!   CBMBenchmarkContextCompilerSelector SC(cbmSystem);
!   CBMBenchmarkContextCompiler         *C = 0;
!   CBMBenchmarkContextCompilerOptions  *O;
    std::string bench;
    std::string compiler;
--- 86,93 ----
    CBMBenchmark                        *B = 0;
    
!   CBMCompilerSelector                 SC(cbmSystem);
!   CBMCompiler                         *C = 0;
!   CBMCompilerOptions                  *O;
! 
    std::string bench;
    std::string compiler;
***************
*** 256,261 ****
  	options="";
        }
!       O=new CBMBenchmarkContextCompilerOptions(C,
! 					       (char*) options.c_str());
  
        if (B->getStatus()<CBMBenchmark::Preconfigured) {
--- 254,259 ----
  	options="";
        }
!       O=new CBMCompilerOptions(C,
! 			       (char*) options.c_str());
  
        if (B->getStatus()<CBMBenchmark::Preconfigured) {

Index: main.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/main.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** main.cpp	25 Sep 2006 17:29:32 -0000	1.5
--- main.cpp	1 Nov 2006 13:06:47 -0000	1.6
***************
*** 1,11 ****
  #include <config.h>
! 
! #ifdef CBM_SYSTEM_LINUX
! # include <System/System-Linux.h>
! #endif
! 
! #ifdef CBM_SYSTEM_CYGWIN
! # include <System/System-Cygwin.h>
! #endif
  
  #ifdef CBM_SYSTEM_FREEBSD
--- 1,4 ----
  #include <config.h>
! #include <libcompbenchmarks.h>
  
  #ifdef CBM_SYSTEM_FREEBSD

Index: cloptions.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cloptions.h	10 Oct 2006 16:52:51 -0000	1.3
--- cloptions.h	1 Nov 2006 13:06:47 -0000	1.4
***************
*** 8,18 ****
  
  #ifndef H_CBMCLOPTIONS
! #define H_CBMOPTIONS
! 
! /** User option defining if package's test suite has to be run */
! extern int UO_enableTestSuite;
  
! /** User option defining 'force' mode */
! extern int UO_force;
  
  /** Parse command line arguments.
--- 8,14 ----
  
  #ifndef H_CBMCLOPTIONS
! #define H_CBMCLOPTIONS 1
  
! #include <libcompbenchmarks.h>
  
  /** Parse command line arguments.