cppunit-cvs

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

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

Modified Files:
	testinfo.cpp 
Log Message:
Made context related function private.

Index: testinfo.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/testinfo.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** testinfo.cpp	8 Aug 2005 22:10:21 -0000	1.12
--- testinfo.cpp	10 Aug 2005 07:42:52 -0000	1.13
***************
*** 282,297 ****
     }
  
-    TestInfoDataPtr saveAndResetContext()
-    {
-       TestInfoDataPtr oldData = staticData.get();
-       staticData.get().reset( new TestInfoData() );
-       return oldData;
-    }
- 
-    void restoreContext( const TestInfoDataPtr &oldContext )
-    {
-       staticData = oldContext;
-    }
- 
     void setAbortingAssertionMode( AbortingAssertionMode mode )
     {
--- 282,285 ----
***************
*** 322,332 ****
  
     ScopedContextOverride::ScopedContextOverride()
!       : context_( saveAndResetContext() )
     {
     }
  
     ScopedContextOverride::~ScopedContextOverride()
     {
!       restoreContext( context_ );
     }
  
--- 310,321 ----
  
     ScopedContextOverride::ScopedContextOverride()
!       : context_( staticData.get() )
     {
+       staticData.get().reset( new TestInfoData() );
     }
  
     ScopedContextOverride::~ScopedContextOverride()
     {
!       staticData = context_;
     }