[Compbench-devel] CompBenchmarks++/libcompbenchmarks/System System.h, 1.6, 1.7

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

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

Modified Files:
	System.h 
Log Message:
CBM::Plan is defined for swig.

Index: System.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** System.h	6 Feb 2007 19:36:45 -0000	1.6
--- System.h	15 Feb 2007 19:02:38 -0000	1.7
***************
*** 10,14 ****
  #define H_CBMSYSTEM
  
! #include <Plan/Plan.h>
  
  #include <vector>
--- 10,25 ----
  #define H_CBMSYSTEM
  
! #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
  
  #include <vector>
***************
*** 31,35 ****
    protected:
      class Config *configuration;
!     CBM::Plan    *plan;
  
      std::string  configurationFile;
--- 42,46 ----
    protected:
      class Config *configuration;
!     CBM_PLAN     *plan;
  
      std::string  configurationFile;
***************
*** 92,96 ****
      virtual std::string Version(void);
  
!     virtual CBM::Plan *Plan(void);
  
      /** Get used configuration.
--- 103,107 ----
      virtual std::string Version(void);
  
!     virtual CBM_PLAN *Plan(void);
  
      /** Get used configuration.