gigablast/open-source-search-engine
1
0
Fork 0
mirror of https://github.com/gigablast/open-source-search-engine.git synced 2024-10-04 12:17:35 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into testing

Browse Source
This commit is contained in:
mwells 2013-10-13 00:20:37 -07:00
commit d4b5c37f45
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mem.cpp
View File

@ -323,7 +323,7 @@ void * operator new [] (size_t size) throw (std::bad_alloc) {
if ( g_mem.m_used + size >= g_mem.m_maxMem &&
g_mem.m_maxMem > 1000000 ) {
log("mem: new(%i): Out of memory.", size );
throw bad_alloc();
throw std::bad_alloc();
//throw 1;
}
#ifdef _EFENCE_