[Compbench-devel] CompBenchmarks++/Compiler/Compiler-GCC Compiler-GCC.cpp, 1.2, 1.3 Compiler-GCC.h, 1.2, 1.3

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

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

Modified Files:
	Compiler-GCC.cpp Compiler-GCC.h 
Log Message:
CBM namespace.

Index: Compiler-GCC.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Compiler/Compiler-GCC/Compiler-GCC.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Compiler-GCC.h	1 Nov 2006 11:31:05 -0000	1.2
--- Compiler-GCC.h	18 Jan 2007 18:43:41 -0000	1.3
***************
*** 11,51 ****
  
  #include <Compiler/Compiler.h>
- /** \brief Defines the gcc compiler
-  */
- class CBMCompilerGCC : public CBMCompiler
- {
-  private:
-  protected:
  
!   virtual std::string getCompilerName(void);
!   virtual std::string getCompilerVersion(void);
!   virtual char *language(void);
  
!  public:
!   CBMCompilerGCC (class CBMSystem *_system,
! 				  char            *_compilerBinary);
  
!   virtual std::string compiler(void);
!   virtual ~CBMCompilerGCC();
! };
  
  
- /** \brief Defines the g++ compiler
-  */
- class CBMCompilerGCC_cpp : public CBMCompiler
- {
-  private:
-  protected:
  
!   virtual std::string getCompilerName(void);
!   virtual std::string getCompilerVersion(void);
!   virtual char *language(void);
  
!  public:
!   CBMCompilerGCC_cpp (class CBMSystem *_system,
! 				  char            *_compilerBinary);
  
-   virtual std::string compiler(void);
-   virtual ~CBMCompilerGCC_cpp();
- };
  #endif
--- 11,55 ----
  
  #include <Compiler/Compiler.h>
  
! namespace CBM {
!   /** \brief Defines the gcc compiler
!    */
!   class CompilerGCC : public Compiler
!   {
!   private:
!   protected:
  
!     virtual std::string getCompilerName(void);
!     virtual std::string getCompilerVersion(void);
!     virtual char *language(void);
  
!   public:
!     CompilerGCC(class           System *_system,
! 		char            *_compilerBinary);
  
+     virtual std::string compiler(void);
+     virtual ~CompilerGCC();
+   };
  
  
!   /** \brief Defines the g++ compiler
!    */
!   class CompilerGCC_cpp : public Compiler
!   {
!   private:
!   protected:
  
!     virtual std::string getCompilerName(void);
!     virtual std::string getCompilerVersion(void);
!     virtual char *language(void);
! 
!   public:
!     CompilerGCC_cpp (class           System *_system,
! 		     char            *_compilerBinary);
! 
!     virtual std::string compiler(void);
!     virtual ~CompilerGCC_cpp();
!   };
! }
  
  #endif

Index: Compiler-GCC.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Compiler/Compiler-GCC/Compiler-GCC.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Compiler-GCC.cpp	1 Nov 2006 11:31:05 -0000	1.2
--- Compiler-GCC.cpp	18 Jan 2007 18:43:41 -0000	1.3
***************
*** 12,22 ****
  #include <config.h>
  
! CBMCompilerGCC::CBMCompilerGCC(CBMSystem *_system,
! 							       char      *_compilerBinary)
!   : CBMCompiler(_system, _compilerBinary)
  {
  }
  
! std::string CBMCompilerGCC::compiler(void)
  {
    std::string str = "gcc";
--- 12,24 ----
  #include <config.h>
  
! using namespace CBM;
! 
! CompilerGCC::CompilerGCC(CBM::System *_system,
! 	 char        *_compilerBinary)
!   : Compiler(_system, _compilerBinary)
  {
  }
  
! std::string CompilerGCC::compiler(void)
  {
    std::string str = "gcc";
***************
*** 25,29 ****
  }
  
! std::string CBMCompilerGCC::getCompilerName(void)
  {
    std::string cmd = compilerBinary;
--- 27,31 ----
  }
  
! std::string CompilerGCC::getCompilerName(void)
  {
    std::string cmd = compilerBinary;
***************
*** 44,48 ****
  }
  
! std::string CBMCompilerGCC::getCompilerVersion(void)
  {
    std::string cmd = "I=`";
--- 46,50 ----
  }
  
! std::string CompilerGCC::getCompilerVersion(void)
  {
    std::string cmd = "I=`";
***************
*** 65,84 ****
  }
  
! char *CBMCompilerGCC::language(void)
  {
    return("C");
  }
  
! CBMCompilerGCC::~CBMCompilerGCC()
  {
  }
  
! CBMCompilerGCC_cpp::CBMCompilerGCC_cpp(CBMSystem *_system,
! 							       char      *_compilerBinary)
!   : CBMCompiler(_system, _compilerBinary)
  {
  }
  
! std::string CBMCompilerGCC_cpp::compiler(void)
  {
    std::string str = "g++";
--- 67,86 ----
  }
  
! char *CompilerGCC::language(void)
  {
    return("C");
  }
  
! CompilerGCC::~CompilerGCC()
  {
  }
  
! CompilerGCC_cpp::CompilerGCC_cpp(CBM::System *_system,
! 		 char      *_compilerBinary)
!   : Compiler(_system, _compilerBinary)
  {
  }
  
! std::string CompilerGCC_cpp::compiler(void)
  {
    std::string str = "g++";
***************
*** 87,91 ****
  }
  
! std::string CBMCompilerGCC_cpp::getCompilerName(void)
  {
    std::string cmd = compilerBinary;
--- 89,93 ----
  }
  
! std::string CompilerGCC_cpp::getCompilerName(void)
  {
    std::string cmd = compilerBinary;
***************
*** 106,110 ****
  }
  
! std::string CBMCompilerGCC_cpp::getCompilerVersion(void)
  {
    std::string cmd = "I=`";
--- 108,112 ----
  }
  
! std::string CompilerGCC_cpp::getCompilerVersion(void)
  {
    std::string cmd = "I=`";
***************
*** 127,136 ****
  }
  
! char *CBMCompilerGCC_cpp::language(void)
  {
    return("C++");
  }
  
! CBMCompilerGCC_cpp::~CBMCompilerGCC_cpp()
  {
  }
--- 129,138 ----
  }
  
! char *CompilerGCC_cpp::language(void)
  {
    return("C++");
  }
  
! CompilerGCC_cpp::~CompilerGCC_cpp()
  {
  }