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

fix merge

Browse Source
This commit is contained in:
Matt 2014-12-11 18:28:02 -08:00
parent bd926a69b5
commit 690cc7cfc6
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Msg39.cpp
View File

@ -1499,15 +1499,11 @@ void Msg39::estimateHitsAndSendReply ( ) {
FacetEntry *fe;
fe = (FacetEntry *)ft->getValFromSlot(k);
// sanity
<<<<<<< HEAD
// no, count can be zero if its a range facet
// that was never added to. we add those
// empty FaceEntries only for range facets
// in Posdb.cpp
//if(fe->m_count == 0 ) { char *xx=NULL;*xx=0;}
=======
//if ( fe->m_count ==0) { char *xx=NULL;*xx=0;}
>>>>>>> diffbot
memcpy ( p , fe , sizeof(FacetEntry) );
p += sizeof(FacetEntry);
// do not breach