Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/IECore/ObjectPool.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2013, Image Engine Design Inc. All rights reserved.
// Copyright (c) 2013-2014, Image Engine Design Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -141,7 +141,7 @@ ObjectPoolPtr ObjectPool::defaultObjectPool()
if( !c )
{
const char *m = getenv( "IECORE_OBJECTPOOL_MEMORY" );
int mi = m ? boost::lexical_cast<int>( m ) : 500;
size_t mi = m ? boost::lexical_cast<size_t>( m ) : 500;
c = new ObjectPool(1024 * 1024 * mi);
}
return c;
Expand Down