[Compbench-devel] CompBenchmarks++/Benchmark Benchmark.h, 1.14, 1.15 Package.cpp, 1.2, 1.3 Package.h, 1.2, 1.3

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

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

Modified Files:
	Benchmark.h Package.cpp Package.h 
Log Message:
Fixes for CBMPackage and new related API.

Index: Benchmark.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Benchmark.h	4 Jan 2007 18:56:13 -0000	1.14
--- Benchmark.h	4 Jan 2007 19:39:52 -0000	1.15
***************
*** 78,83 ****
  
  #define DLPackageWrapper_declare() \
!   BenchmarkVector& Benchmarks(void); \
!   CBMBenchmark *Benchmark(std::string bid)
  
  #endif
--- 78,83 ----
  
  #define DLPackageWrapper_declare() \
!   virtual BenchmarkVector& Benchmarks(void); \
!   virtual CBMBenchmark *Benchmark(std::string bid)
  
  #endif

Index: Package.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Package.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Package.cpp	4 Jan 2007 18:56:13 -0000	1.2
--- Package.cpp	4 Jan 2007 19:39:52 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  CBMBenchmark *CBMPackage::Benchmark(std::string bid)
  {
+   std::cerr << "virtual CBMPackage::Benchmark() called" << std::endl;
    return(0);
  }

Index: Package.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Package.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Package.h	4 Jan 2007 18:56:13 -0000	1.2
--- Package.h	4 Jan 2007 19:39:52 -0000	1.3
***************
*** 52,56 ****
   private:
    /** Package status
!    *  \sa CBMBenchmark::Status
     *  \sa storeStatus()
     *  \sa getStatus()
--- 52,56 ----
   private:
    /** Package status
!    *  \sa CBMPackage::Status
     *  \sa storeStatus()
     *  \sa getStatus()
***************
*** 192,196 ****
    /** Get a benchmark according to its identifier.
        \return References to a CBMBenchmark object */
!   class CBMBenchmark *Benchmark(std::string bid);
    
    /** Stores benchmark status
--- 192,196 ----
    /** Get a benchmark according to its identifier.
        \return References to a CBMBenchmark object */
!   virtual class CBMBenchmark *Benchmark(std::string bid);
    
    /** Stores benchmark status
***************
*** 399,403 ****
    /** Returns benchmark's status
     *  \return status (enum).
!    *  \sa CBMBenchmark::Status */
    virtual Status getStatus(void);
  
--- 399,403 ----
    /** Returns benchmark's status
     *  \return status (enum).
!    *  \sa CBMPackage::Status */
    virtual Status getStatus(void);