[Compbench-devel] CompBenchmarks++/libcompbenchmarks/System System.cpp, 1.11, 1.12

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

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

Modified Files:
	System.cpp 
Log Message:
CEL obsoleted.
Logic is integrated within descriptions.


Index: System.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** System.cpp	22 Mar 2007 19:17:29 -0000	1.11
--- System.cpp	16 Apr 2007 18:23:42 -0000	1.12
***************
*** 11,16 ****
  #include <Base/Config.h>
  #include <Base/md5.h>
! #include <CEL/CEL-Function.h>
! #include <CEL/CEL-Include.h>
  #include <Benchmark/Benchmark-DLLoader.h>
  
--- 11,15 ----
  #include <Base/Config.h>
  #include <Base/md5.h>
! #include <Compiler/Compiler-Option-Description.h>
  #include <Benchmark/Benchmark-DLLoader.h>
  
***************
*** 38,42 ****
  {
    std::string tmp_bm;
!   std::string tmp_cel;
  
    configurationFile=_filename;
--- 37,41 ----
  {
    std::string tmp_bm;
!   std::string tmp_des;
  
    configurationFile=_filename;
***************
*** 48,52 ****
  
    tmp_bm=PREFIX;
!   tmp_cel=PREFIX;
  
    tmp_bm+="/lib";
--- 47,51 ----
  
    tmp_bm=PREFIX;
!   tmp_des=PREFIX;
  
    tmp_bm+="/lib";
***************
*** 56,65 ****
    CBM::cbmlib_paths.push_back("../../SupportedBenchmarks/.libs");
  
!   tmp_cel+="/share/KB";
!   CBM::CelIncludePathAdd(tmp_cel);
!   CBM::CelIncludePathAdd("./libcompbenchmarks/share/KB");
!   CBM::CelIncludePathAdd("../libcompbenchmarks/share/KB");
!   CBM::CelIncludePathAdd("../../libcompbenchmarks/share/KB");
!   CBM::CelIncludePathAdd("../../../libcompbenchmarks/share/KB");
  }
  
--- 55,64 ----
    CBM::cbmlib_paths.push_back("../../SupportedBenchmarks/.libs");
  
!   tmp_des+="/share/KB";
!   CBM::descriptionIncludePathAdd(tmp_des);
!   CBM::descriptionIncludePathAdd("./libcompbenchmarks/share/KB");
!   CBM::descriptionIncludePathAdd("../libcompbenchmarks/share/KB");
!   CBM::descriptionIncludePathAdd("../../libcompbenchmarks/share/KB");
!   CBM::descriptionIncludePathAdd("../../../libcompbenchmarks/share/KB");
  }
  
***************
*** 572,577 ****
    }
  
-   CELFunctionDone();
- 
    return(1);
  }
--- 571,574 ----