mockpp-commits

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9549/mockpp

Modified Files:
	gen_responsevector_N.pl VisitableMockObject_template.h 
Log Message:
wrong params

Index: VisitableMockObject_template.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_template.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- VisitableMockObject_template.h	26 Oct 2005 20:43:31 -0000	1.27
+++ VisitableMockObject_template.h	27 Oct 2005 18:56:07 -0000	1.28
@@ -93,8 +93,10 @@
     std::vector<unsigned> counter;
 };
 
+
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
+
 } // namespace mockpp
 
 

Index: gen_responsevector_N.pl
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/gen_responsevector_N.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gen_responsevector_N.pl	26 Oct 2005 20:05:07 -0000	1.1
+++ gen_responsevector_N.pl	27 Oct 2005 18:56:07 -0000	1.2
@@ -196,10 +196,10 @@
     {";
       
 for($p = 1; $p <= $numArgs; ++$p) { print OUT "
-      const ConstraintHolder<P" . $p . "> p" . $p . " = new IsEqual<P" . $p . ">(p" . $p . ");" }
+      const ConstraintHolder<P" . $p . "> h" . $p . " = new IsEqual<P" . $p . ">(p" . $p . ");" }
       
 print OUT "
-      add(t, " . $args . ", count);
+      add(t, " . $hArgs . ", count);
     }
 
   /** Adds a throwable.
@@ -226,7 +226,7 @@
       typename mockpp::Constraint<P" . $p . ">::AP cons" . $p . " (p" . $p . ");"; }
 
 for($p = 1; $p <= $numArgs; ++$p) { print OUT "
-      p" . $p . "vec.push_back(cons" . $p . ".release());"; }
+      t" . $p . "vec.push_back(cons" . $p . ".release());"; }
 
 print OUT "
     }
@@ -272,6 +272,7 @@
              && t" . $p . "vec[i]->eval(p" . $p . ")"; }
              
 print OUT "
+            )
          {
            if (tvec.at(i) == 0)
              return false;
@@ -298,7 +299,7 @@
 /** Class returning a throwable depending on the parameters
   * passed to a method.
   */
-template <" . $templateParms . ">
+template <typename R, " . $templateParms . ">
 class ResponseVector" . $numArgs . "  : public ResponseThrowableVector" . $numArgs . "<" . $templateArgs . ">
 {
   public:
@@ -340,7 +341,7 @@
     void add(Throwable *t,";
              
 for($p = 1; $p <= $numArgs; ++$p) { print OUT "
-             const ConstraintHolder<P" . $p . "> &p" . $p . ",";}
+             const ConstraintHolder<P" . $p . "> &p" . $p . ","; }
 
 print OUT "
              unsigned count)
@@ -429,6 +430,7 @@
              && this->t" . $p . "vec[i]->eval(p" . $p . ")"; }
 
 print OUT "
+            )
          {
            if (this->tvec.at(i) != 0)
              return false;