Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V2 llcommon merge

Browse Source
This commit is contained in:
Shyotl
2011-02-22 18:24:17 -06:00
parent a207a71066
commit b31db27545
4 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/llcommon/llapr.cpp
View File

@@ -91,13 +91,12 @@ void ll_cleanup_apr()
//
//LLAPRPool
//
LLAPRPool::LLAPRPool(apr_pool_t *parent, apr_size_t size, BOOL releasePoolFlag)
{
mParent = parent ;
mReleasePoolFlag = releasePoolFlag ;
mMaxSize = size ;
mPool = NULL ;
LLAPRPool::LLAPRPool(apr_pool_t *parent, apr_size_t size, BOOL releasePoolFlag)
: mParent(parent),
mReleasePoolFlag(releasePoolFlag),
mMaxSize(size),
mPool(NULL)
{
createAPRPool() ;
}
@@ -399,7 +398,7 @@ S32 LLAPRFile::read(void *buf, S32 nbytes)
//llassert_always(mFile); (ASC-TUDCC) -HgB
if(!mFile)
{
llwarns << "apr mFile is removed by somebody else. Can not write." << llendl ;
llwarns << "apr mFile is removed by somebody else. Can not read." << llendl ;
return 0;
}