[Cppunit-cvs] cppunit2/include/cpput assertenum.h,1.5,1.6

[Baptiste L. <bl...@us...>]

Update of /cvsroot/cppunit/cppunit2/include/cpput
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6330/include/cpput

Modified Files:
	assertenum.h 
Log Message:
* removed warning about 'noDifference'
* added missing typename

Index: assertenum.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpput/assertenum.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** assertenum.h	21 Oct 2004 17:23:22 -0000	1.5
--- assertenum.h	23 Feb 2005 22:08:45 -0000	1.6
***************
*** 42,45 ****
--- 42,47 ----
     namespace Impl {
  
+       enum { noDifference = -1 };
+ 
        template<class ExpectedEnumType
                ,class ActualEnumType
***************
*** 62,66 ****
           if ( actual.is_open() )
              return diffIndex;
!          return noDifference;
        }
  
--- 64,68 ----
           if ( actual.is_open() )
              return diffIndex;
!          return (unsigned int)noDifference;
        }
  
***************
*** 84,91 ****
              CPPTL_TYPENAME ExpectedSetType::value_type expectedItem = expectedEnum.current();
              bool found = false;
!             ExtraneousSeqType::iterator it = extraneous.begin();
              for ( ; it != extraneous.end(); ++it )
              {
!                const ExtraneousSeqType::value_type &actualItem = *it;
                 if ( predicate( expectedItem, actualItem ) )
                 {
--- 86,93 ----
              CPPTL_TYPENAME ExpectedSetType::value_type expectedItem = expectedEnum.current();
              bool found = false;
!             CPPTL_TYPENAME ExtraneousSeqType::iterator it = extraneous.begin();
              for ( ; it != extraneous.end(); ++it )
              {
!                const CPPTL_TYPENAME ExtraneousSeqType::value_type &actualItem = *it;
                 if ( predicate( expectedItem, actualItem ) )
                 {
***************
*** 103,108 ****
     } // namespace Impl
  
-    enum { noDifference = -1 };
- 
     template<class ExpectedEnumerator
             ,class ActualEnumerator
--- 105,108 ----
***************
*** 120,124 ****
                                                             actual, 
                                                             comparator );
!       if ( diffIndex == noDifference )
           return;
  
--- 120,124 ----
                                                             actual, 
                                                             comparator );
!       if ( diffIndex == Impl::noDifference )
           return;
  
***************
*** 234,239 ****
                                            const Message &message )
     {
!       std::deque<ExpectedEnumerator::value_type> missing;
!       std::deque<ActualEnumerator::value_type> extraneous;
        Impl::getSetDifference( expected, actual,
                                missing, extraneous,
--- 234,239 ----
                                            const Message &message )
     {
!       std::deque<CPPTL_TYPENAME ExpectedEnumerator::value_type> missing;
!       std::deque<CPPTL_TYPENAME ActualEnumerator::value_type> extraneous;
        Impl::getSetDifference( expected, actual,
                                missing, extraneous,