[Compbench-devel] CompBenchmarks++/libcompbenchmarks/CEL CEL-Atom.h, 1.4, 1.5

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

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

Modified Files:
	CEL-Atom.h 
Log Message:
Evaluate() renamed to evaluate();
Evaluate() introduced.
Other API changes.

Index: CEL-Atom.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/CEL/CEL-Atom.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CEL-Atom.h	8 Mar 2007 17:09:18 -0000	1.4
--- CEL-Atom.h	11 Mar 2007 18:51:32 -0000	1.5
***************
*** 31,37 ****
      std::vector<celArray_t*>             celArrays;
  
-     virtual void varDone(void);
-     virtual void arrayDone(void);
- 
    protected:
      CelAtom                              *parent;
--- 31,34 ----
***************
*** 46,50 ****
--- 43,51 ----
      virtual CelAtom *varOwner(void);
  
+     virtual std::string evaluate(void) = 0;
    public:
+     virtual void varDone(void);
+     virtual void arrayDone(void);
+ 
      virtual std::string xmlEntityName(void) = 0;
      virtual std::vector<CelAtom *>& Childs(void);
***************
*** 65,69 ****
  
      virtual void add(CelAtom *_atom);
!     virtual std::string Evaluate(void) = 0;
      virtual std::string str(int _indent = 0);
  
--- 66,70 ----
  
      virtual void add(CelAtom *_atom);
!     virtual std::string Evaluate(void);
      virtual std::string str(int _indent = 0);
  
***************
*** 73,81 ****
    class CelContainer : public CelAtom {
    protected:
    public:
      CelContainer();
  
      virtual std::string xmlEntityName(void);
-     virtual std::string Evaluate(void);
  
      virtual ~CelContainer();
--- 74,82 ----
    class CelContainer : public CelAtom {
    protected:
+     virtual std::string evaluate(void);
    public:
      CelContainer();
  
      virtual std::string xmlEntityName(void);
  
      virtual ~CelContainer();