[Mockpp-commits] mockpp/mockpp/builder ArgumentsMatchBuilder.h,1.27,1.28

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

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

Modified Files:
	ArgumentsMatchBuilder.h 
Log Message:
better support for typeless constraints

Index: ArgumentsMatchBuilder.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/ArgumentsMatchBuilder.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ArgumentsMatchBuilder.h	30 Jan 2005 12:09:17 -0000	1.27
--- ArgumentsMatchBuilder.h	3 Mar 2005 15:57:18 -0000	1.28
***************
*** 42,45 ****
--- 42,46 ----
  
  #include <mockpp/constraint/ConstraintSet.h>
+ #include <mockpp/constraint/ConstraintHolder.h>
  
  #include <mockpp/matcher/NoArgumentsMatcher.h>
***************
*** 154,158 ****
      * @return the builder object
      */
!     MatchBuilder<R, I>& with( typename Constraint<T1>::AP cons1 )
      {
        return with_cs( ConstraintSetType( cons1 ) );
--- 155,159 ----
      * @return the builder object
      */
!     MatchBuilder<R, I>& with( const ConstraintHolder<T1> &cons1 )
      {
        return with_cs( ConstraintSetType( cons1 ) );
***************
*** 197,202 ****
      * @return the builder object
      */
!     MatchBuilder<R, I>& with( typename Constraint<T1>::AP cons1,
!                               typename Constraint<T2>::AP cons2 )
      {
        return with_cs( ConstraintSetType( cons1, cons2 ) );
--- 198,203 ----
      * @return the builder object
      */
!     MatchBuilder<R, I>& with( const ConstraintHolder<T1> &cons1,
!                               const ConstraintHolder<T2> &cons2 )
      {
        return with_cs( ConstraintSetType( cons1, cons2 ) );
***************
*** 243,249 ****
      * @return the builder object
      */
!     MatchBuilder<R, I>& with( typename Constraint<T1>::AP cons1,
!                               typename Constraint<T2>::AP cons2,
!                               typename Constraint<T3>::AP cons3 )
      {
        return with_cs( ConstraintSetType( cons1, cons2, cons3 ) );
--- 244,250 ----
      * @return the builder object
      */
!     MatchBuilder<R, I>& with( const ConstraintHolder<T1> &cons1,
!                               const ConstraintHolder<T2> &cons2,
!                               const ConstraintHolder<T3> &cons3 )
      {
        return with_cs( ConstraintSetType( cons1, cons2, cons3 ) );
***************
*** 292,299 ****
      * @return the builder object
      */
!     MatchBuilder<R, I>& with( typename Constraint<T1>::AP cons1,
!                               typename Constraint<T2>::AP cons2,
!                               typename Constraint<T3>::AP cons3,
!                               typename Constraint<T4>::AP cons4 )
      {
        return with_cs( ConstraintSetType( cons1, cons2, cons3, cons4 ) );
--- 293,300 ----
      * @return the builder object
      */
!     MatchBuilder<R, I>& with( const ConstraintHolder<T1> &cons1,
!                               const ConstraintHolder<T2> &cons2,
!                               const ConstraintHolder<T3> &cons3,
!                               const ConstraintHolder<T4> &cons4 )
      {
        return with_cs( ConstraintSetType( cons1, cons2, cons3, cons4 ) );
***************
*** 344,352 ****
      * @return the builder object
      */
!     MatchBuilder<R, I>& with( typename Constraint<T1>::AP cons1,
!                               typename Constraint<T2>::AP cons2,
!                               typename Constraint<T3>::AP cons3,
!                               typename Constraint<T4>::AP cons4,
!                               typename Constraint<T5>::AP cons5 )
      {
        return with_cs( ConstraintSetType( cons1, cons2, cons3, cons4, cons5 ) );
--- 345,353 ----
      * @return the builder object
      */
!     MatchBuilder<R, I>& with( const ConstraintHolder<T1> &cons1,
!                               const ConstraintHolder<T2> &cons2,
!                               const ConstraintHolder<T3> &cons3,
!                               const ConstraintHolder<T4> &cons4,
!                               const ConstraintHolder<T5> &cons5 )
      {
        return with_cs( ConstraintSetType( cons1, cons2, cons3, cons4, cons5 ) );