Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20354
Modified Files:
CBM.i Glue.cpp Glue.h
Log Message:
CBMPackage and new related API used.
Index: Glue.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Glue.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Glue.cpp 28 Dec 2006 13:24:10 -0000 1.2
--- Glue.cpp 4 Jan 2007 19:37:29 -0000 1.3
***************
*** 9,13 ****
------------------------------------------------------------------------- */
! #include <Glue.h>
CBM_SYSTEM *sys;
--- 9,14 ----
------------------------------------------------------------------------- */
! #include <CBM-PI/Glue.h>
! #include <Benchmark/Benchmark-DLLoader.h>
CBM_SYSTEM *sys;
Index: CBM.i
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CBM.i 28 Dec 2006 13:22:57 -0000 1.2
--- CBM.i 4 Jan 2007 19:37:29 -0000 1.3
***************
*** 22,25 ****
--- 22,30 ----
%}
+ %module CBMPackage
+ %{
+ #include "Benchmark/Package.h"
+ %}
+
%module CBMBenchmark
%{
***************
*** 27,35 ****
%}
- %module CBMBenchmarkSelector
- %{
- #include "Benchmark/Benchmark-Selector.h"
- %}
-
%module CBMCompiler
%{
--- 32,35 ----
***************
*** 42,47 ****
%include "System/System-Unix.h"
%include "System/System-Linux.h"
%include "Benchmark/Benchmark.h"
- %include "Benchmark/Benchmark-Selector.h"
%include "Compiler/Compiler.h"
%include "Glue.h"
--- 42,47 ----
%include "System/System-Unix.h"
%include "System/System-Linux.h"
+ %include "Benchmark/Package.h"
%include "Benchmark/Benchmark.h"
%include "Compiler/Compiler.h"
%include "Glue.h"
Index: Glue.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Glue.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Glue.h 28 Dec 2006 00:38:14 -0000 1.1
--- Glue.h 4 Jan 2007 19:37:29 -0000 1.2
***************
*** 12,17 ****
--- 12,19 ----
#include <libcompbenchmarks.h>
+ #include <Benchmark/Benchmark.h>
extern CBM_SYSTEM *Init(void);
+
extern std::string & stringref(char *str);
extern char *c_str(std::string &str);
|
