[Loki-lib-cvs] SF.net SVN: loki-lib:[1075] trunk/src/SmallObj.cpp

[<ric...@us...>]

Revision: 1075
          http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1075&view=rev
Author:   rich_sposato
Date:     2010-09-16 17:23:59 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
Replaced repeated calculation with local variable.

Modified Paths:
--------------
    trunk/src/SmallObj.cpp

Modified: trunk/src/SmallObj.cpp
===================================================================
--- trunk/src/SmallObj.cpp	2010-09-16 17:22:53 UTC (rev 1074)
+++ trunk/src/SmallObj.cpp	2010-09-16 17:23:59 UTC (rev 1075)
@@ -943,18 +943,19 @@
     assert( CountEmptyChunks() < 2 );
 
     Chunk * foundChunk = nullptr;
-    if ( ( nullptr != hint ) && ( hint->HasBlock( p, numBlocks_ * blockSize_ ) ) )
+    const ::std::size_t chunkLength = numBlocks_ * blockSize_;
+    if ( ( nullptr != hint ) && ( hint->HasBlock( p, chunkLength ) ) )
         foundChunk = hint;
-    else if ( deallocChunk_->HasBlock( p, numBlocks_ * blockSize_ ) )
+    else if ( deallocChunk_->HasBlock( p, chunkLength ) )
         foundChunk = deallocChunk_;
-    else if ( allocChunk_->HasBlock( p, numBlocks_ * blockSize_ ) )
+    else if ( allocChunk_->HasBlock( p, chunkLength ) )
         foundChunk = allocChunk_;
     else
         foundChunk = VicinityFind( p );
     if ( nullptr == foundChunk )
         return false;
 
-    assert( foundChunk->HasBlock( p, numBlocks_ * blockSize_ ) );
+    assert( foundChunk->HasBlock( p, chunkLength ) );
 #ifdef LOKI_CHECK_FOR_CORRUPTION
     if ( foundChunk->IsCorrupt( numBlocks_, blockSize_, true ) )
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.