[Cppunit-cvs] cppunit/examples/cppunittest MockFunctor.h, 1.2, 1.3 MockProtector.h, 1.2, 1.3 XmlOutputterTest.cpp, 1.13, 1.14 XmlUniformiser.cpp, 1.7, 1.8

[Steven R. <sm...@us...>]

Update of /cvsroot/cppunit/cppunit/examples/cppunittest
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4426/examples/cppunittest

Modified Files:
	MockFunctor.h MockProtector.h XmlOutputterTest.cpp 
	XmlUniformiser.cpp 
Log Message:
Arrange class initializers in correct order.

Index: MockFunctor.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit/examples/cppunittest/MockFunctor.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MockFunctor.h	7 May 2003 21:13:38 -0000	1.2
--- MockFunctor.h	12 Jan 2007 05:56:34 -0000	1.3
***************
*** 12,21 ****
  public:
    MockFunctor()
!     : m_shouldThrow( false )
      , m_shouldThrowFailureException( false )
      , m_hasExpectation( false )
      , m_actualCallCount( 0 )
      , m_expectedCallCount( 0 )
-     , m_shouldSucceed( true )
    {
    }
--- 12,21 ----
  public:
    MockFunctor()
!     : m_shouldSucceed( true )
!     , m_shouldThrow( false )
      , m_shouldThrowFailureException( false )
      , m_hasExpectation( false )
      , m_actualCallCount( 0 )
      , m_expectedCallCount( 0 )
    {
    }

Index: MockProtector.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit/examples/cppunittest/MockProtector.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MockProtector.h	7 May 2003 21:13:38 -0000	1.2
--- MockProtector.h	12 Jan 2007 05:56:34 -0000	1.3
***************
*** 20,27 ****
  public:
    MockProtector()
!     : m_expectException( false )
!     , m_hasExpectation( false )
!     , m_wasCalled( false )
      , m_wasTrapped( false )
      , m_shouldPropagateException( false )
    {
--- 20,27 ----
  public:
    MockProtector()
!     : m_wasCalled( false )
      , m_wasTrapped( false )
+     , m_expectException( false )
+     , m_hasExpectation( false )
      , m_shouldPropagateException( false )
    {

Index: XmlUniformiser.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/examples/cppunittest/XmlUniformiser.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** XmlUniformiser.cpp	15 Mar 2003 10:21:44 -0000	1.7
--- XmlUniformiser.cpp	12 Jan 2007 05:56:34 -0000	1.8
***************
*** 42,47 ****
  
  XmlUniformiser::XmlUniformiser( const std::string &xml ) :
!     m_xml( xml ),
!     m_index( 0 )
  {
  }
--- 42,47 ----
  
  XmlUniformiser::XmlUniformiser( const std::string &xml ) :
!     m_index( 0 ),
!     m_xml( xml )
  {
  }

Index: XmlOutputterTest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit/examples/cppunittest/XmlOutputterTest.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** XmlOutputterTest.cpp	13 Oct 2005 20:13:15 -0000	1.13
--- XmlOutputterTest.cpp	12 Jan 2007 05:56:34 -0000	1.14
***************
*** 231,239 ****
              int &successfulTestCalls,
              int &failedTestCalls )
!       : m_successfulTestCalls( successfulTestCalls )
!       , m_failedTestCalls( failedTestCalls )
!       , m_beginCalls( beginCalls )
        , m_endCalls( endCalls )
        , m_statisticsCalls( statisticsCalls )
    {
    }
--- 231,239 ----
              int &successfulTestCalls,
              int &failedTestCalls )
!       : m_beginCalls( beginCalls )
        , m_endCalls( endCalls )
        , m_statisticsCalls( statisticsCalls )
+       , m_successfulTestCalls( successfulTestCalls )
+       , m_failedTestCalls( failedTestCalls )
    {
    }