[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Benchmark Benchmark.cpp, 1.8, 1.9 Benchmark.h, 1.5, 1.6

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

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

Modified Files:
	Benchmark.cpp Benchmark.h 
Log Message:
CBM::Plan modified.

Index: Benchmark.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Benchmark.h	15 Feb 2007 18:57:30 -0000	1.5
--- Benchmark.h	17 May 2007 14:29:12 -0000	1.6
***************
*** 15,31 ****
  #include <vector>
  
- #ifdef SWIG
- /* !!! If in SWIG parser, we need to define CBM::Plan so that all methods get
-  * correctly wrapped. Hope there's a better solution... */
-  %module CBM
-  %{
-    #include <Plan/Plan.h>
-  %}
-  #define CBM_PLAN CBM::Plan
- 
- #else
- # define CBM_PLAN class Plan
- #endif
- 
  namespace CBM {
    class System;
--- 15,18 ----
***************
*** 48,52 ****
    protected:
      class Package *package;
!     CBM_PLAN      *plan;
      /** Constructor
       *  Initialise the Benchmark::system variable. */
--- 35,39 ----
    protected:
      class Package *package;
! 
      /** Constructor
       *  Initialise the Benchmark::system variable. */
***************
*** 68,73 ****
  
    public:
-     virtual void setPlan(CBM_PLAN *_plan, int modifyPlanObject);
- 
      /** Benchmark name
  	\return a std::string representing current benchmark's identification
--- 55,58 ----

Index: Benchmark.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Benchmark.cpp	16 May 2007 12:06:17 -0000	1.8
--- Benchmark.cpp	17 May 2007 14:29:12 -0000	1.9
***************
*** 9,13 ****
  #include <Benchmark/Benchmark.h>
  #include <Benchmark/Package.h>
- #include <Plan/Plan.h>
  #include <iostream>
  
--- 9,12 ----
***************
*** 20,24 ****
  {
    package=_package;
-   plan=0;
  }
  /*
--- 19,22 ----
***************
*** 35,46 ****
  */
  
- void Benchmark::setPlan(CBM::Plan *_plan, int modifyPlanObject)
- {
-   if ((modifyPlanObject) && (plan))
-     plan->remove(this);
-  
-   plan=_plan;
- }
- 
  std::string Benchmark::Name(void)
  {
--- 33,36 ----
***************
*** 114,117 ****
  {
    package->removeCached(this);
-   setPlan(0, 1);
  }
--- 104,106 ----