Skip to content

Commit 7535ab7

Browse files
committed
Merge pull request #283 from andrewkaufman/objectPoolMaxSize
Fixing default ObjectPool for larger sizes.
2 parents b97a656 + 03b3136 commit 7535ab7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/IECore/ObjectPool.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//////////////////////////////////////////////////////////////////////////
22
//
3-
// Copyright (c) 2013, Image Engine Design Inc. All rights reserved.
3+
// Copyright (c) 2013-2014, Image Engine Design Inc. All rights reserved.
44
//
55
// Redistribution and use in source and binary forms, with or without
66
// modification, are permitted provided that the following conditions are
@@ -141,7 +141,7 @@ ObjectPoolPtr ObjectPool::defaultObjectPool()
141141
if( !c )
142142
{
143143
const char *m = getenv( "IECORE_OBJECTPOOL_MEMORY" );
144-
int mi = m ? boost::lexical_cast<int>( m ) : 500;
144+
size_t mi = m ? boost::lexical_cast<size_t>( m ) : 500;
145145
c = new ObjectPool(1024 * 1024 * mi);
146146
}
147147
return c;

0 commit comments

Comments
 (0)