[complement-svn] SF.net SVN: complement: [1706] trunk/complement/explore

[<com...@us...>]

Revision: 1706
          http://complement.svn.sourceforge.net/complement/?rev=1706&view=rev
Author:   complement
Date:     2007-08-27 08:10:53 -0700 (Mon, 27 Aug 2007)

Log Message:
-----------
use namespace std for max

Modified Paths:
--------------
    trunk/complement/explore/include/mt/shm.h
    trunk/complement/explore/lib/mt/ChangeLog

Modified: trunk/complement/explore/include/mt/shm.h
===================================================================
--- trunk/complement/explore/include/mt/shm.h	2007-08-25 05:59:33 UTC (rev 1705)
+++ trunk/complement/explore/include/mt/shm.h	2007-08-27 15:10:53 UTC (rev 1706)
@@ -536,7 +536,7 @@
 template <int _Inst>
 void shm_alloc<_Inst>::deallocate( pointer p, size_type n )
 {
-  n = max( n + (__align - n % __align) % __align, sizeof(_fheader) );
+  n = std::max( n + (__align - n % __align) % __align, sizeof(_fheader) );
   _master *m = reinterpret_cast<_master *>( _seg.address() );
   if ( m != reinterpret_cast<_master *>(-1) && (reinterpret_cast<char *>(p) - reinterpret_cast<char *>(_seg.address())) < (_seg.max_size() + sizeof(_master) + sizeof(_aheader) ) ) {
     xmt::basic_lock<xmt::__mutex<false,true> > lk( m->_lock );
@@ -597,7 +597,7 @@
 template <int _Inst>
 void *shm_alloc<_Inst>::_traverse( size_type *_prev, size_type n )
 {
-  n = max( n + (__align - n % __align) % __align, sizeof(_fheader) );
+  n = std::max( n + (__align - n % __align) % __align, sizeof(_fheader) );
   for ( _fheader *h = reinterpret_cast<_fheader *>(reinterpret_cast<char *>(_seg.address()) + *_prev); *_prev != 0;
         _prev = &h->_next, h = reinterpret_cast<_fheader *>(reinterpret_cast<char *>(_seg.address()) + *_prev)) {
     if ( h->_sz >= (n + sizeof( _fheader )) ) { // reduce this free block, write new free header

Modified: trunk/complement/explore/lib/mt/ChangeLog
===================================================================
--- trunk/complement/explore/lib/mt/ChangeLog	2007-08-25 05:59:33 UTC (rev 1705)
+++ trunk/complement/explore/lib/mt/ChangeLog	2007-08-27 15:10:53 UTC (rev 1706)
@@ -1,3 +1,7 @@
+2007-08-27  Petr Ovtchenkov  <pt...@is...>
+
+	* shm.h: use namespace std for max.
+
 2007-08-03  Petr Ovtchenkov  <pt...@is...>
 
 	* test/mt/Makefile: let's try don't include boost's -I if macro


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