|
From: <ric...@us...> - 2011-10-03 04:57:00
|
Revision: 1131
http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1131&view=rev
Author: rich_sposato
Date: 2011-10-03 04:56:54 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
Added void lines to remove compiler warnings. Commented out inappropriate tests. Added call to single-owner test for StrongPtr.
Modified Paths:
--------------
trunk/test/SmartPtr/main.cpp
Modified: trunk/test/SmartPtr/main.cpp
===================================================================
--- trunk/test/SmartPtr/main.cpp 2011-10-03 04:52:52 UTC (rev 1130)
+++ trunk/test/SmartPtr/main.cpp 2011-10-03 04:56:54 UTC (rev 1131)
@@ -36,6 +36,7 @@
extern void DoStrongForwardReferenceTest( void );
extern void DoStrongCompareTests( void );
extern void DoStrongPtrDynamicCastTests( void );
+extern void DoSingleOwnerTests( void );
extern void DoStrongArrayTests( void );
extern void DoLockedPtrTest( void );
@@ -60,6 +61,10 @@
NoCheck, DefaultSPStorage, PropagateConst >
Thingy_DefaultStorage_ptr;
+//typedef Loki::SmartPtr< Thingy, RefCountedMTAdj< >, DisallowConversion,
+// AssertCheck, DefaultSPStorage, PropagateConst >
+// Thingy_Locked_ptr;
+
typedef Loki::SmartPtr< Thingy, RefCounted, DisallowConversion,
AssertCheck, HeapStorage, PropagateConst >
Thingy_HeapStorage_ptr;
@@ -1425,20 +1430,23 @@
from const to non-const, or about assigning a read-only reference, then DestructiveCopy
was designed correctly.
*/
- DestructiveCopyPtr p2;
- assert( !p2 );
- p2 = p1;
- assert( !p1 );
- assert( p2 );
- DestructiveCopyPtr p3( p2 );
- assert( p3 );
- assert( !p2 );
+ //DestructiveCopyPtr p2;
+ //assert( !p2 );
+ //p2 = p1;
+ //assert( !p1 );
+ //assert( p2 );
+ //DestructiveCopyPtr p3( p2 );
+ //assert( p3 );
+ //assert( !p2 );
}
{
/// @todo The following lines need to be uncommented when bug 3224572 gets fixed.
DestructiveCopyPtr p1( MakePointer() );
assert( p1 );
+ DestructiveCopyPtr p2;
+ p2 = MakePointer();
+ assert( p2 );
}
assert( BaseClass::AllDestroyed() );
@@ -1497,10 +1505,12 @@
try
{
Tiger & p4 = sp2[ 4 ];
+ (void)p4;
assert( false );
}
catch ( const ::std::out_of_range & ex )
{
+ (void)ex;
assert( true );
}
@@ -1508,10 +1518,12 @@
try
{
Tiger & p8 = sp1[ 8 ];
+ (void)p8;
assert( false );
}
catch ( const ::std::out_of_range & ex )
{
+ (void)ex;
assert( true );
}
@@ -1540,20 +1552,24 @@
try
{
Tiger & p4 = sp1[ 4 ];
+ (void)p4;
assert( false );
}
catch ( const ::std::out_of_range & ex )
{
+ (void)ex;
assert( true );
}
try
{
Tiger & p8 = sp2[ 8 ];
+ (void)p8;
assert( false );
}
catch ( const ::std::out_of_range & ex )
{
+ (void)ex;
assert( true );
}
@@ -1563,10 +1579,12 @@
try
{
const Tiger & p4 = sp3[ 4 ];
+ (void)p4;
assert( false );
}
catch ( const ::std::out_of_range & ex )
{
+ (void)ex;
assert( true );
}
@@ -1576,10 +1594,12 @@
try
{
const Tiger & p8 = sp5[ 8 ];
+ (void)p8;
assert( false );
}
catch ( const ::std::out_of_range & ex )
{
+ (void)ex;
assert( true );
}
@@ -1622,6 +1642,7 @@
DoStrongReleaseTests();
DoWeakCycleTests();
DoStrongCompareTests();
+ DoSingleOwnerTests();
DoForwardReferenceTest();
DoStrongForwardReferenceTest();
@@ -1633,7 +1654,7 @@
DoRefLinkSwapTests();
DoComRefTest();
- TryColvinGibbonsTrick();
+// TryColvinGibbonsTrick();
DoStrongConstTests();
DoConstConversionTests();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|