ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/openbabel/fingerprint.cpp
(Generate patch)

Comparing trunk/src/openbabel/fingerprint.cpp (file contents):
Revision 741 by tim, Wed Nov 16 19:42:11 2005 UTC vs.
Revision 819 by tim, Fri Dec 16 21:52:50 2005 UTC

# Line 16 | Line 16 | GNU General Public License for more details.
16   GNU General Public License for more details.
17   ***********************************************************************/
18  
19 < #include "babelconfig.hpp"
19 > #include "config.h"
20   #include <vector>
21   #include <algorithm>
22  
# Line 160 | Line 160 | bool FastSearch::Find(OBBase* pOb, vector<unsigned int
160              strstream errorMsg;
161   #endif
162              errorMsg << "Stopped looking after " << i << " molecules." << endl;
163 <            obErrorLog.ThrowError(__FUNCTION__, errorMsg.str(), obInfo);
163 >            obErrorLog.ThrowError(__func__, errorMsg.str(), obInfo);
164            }
165  
166          vector<unsigned int>::iterator itr;
# Line 263 | Line 263 | string FastSearch::ReadIndex(istream* pIndexstream)
263   #endif
264                    errorMsg << "Index has Fingerprints of type '" << _index.header.fpid
265                             << " which is not currently loaded." << endl;
266 <                  obErrorLog.ThrowError(__FUNCTION__, errorMsg.str(), obWarning);
266 >                  obErrorLog.ThrowError(__func__, errorMsg.str(), obWarning);
267                    *(_index.header.datafilename) = '\0';
268                  }
269  
# Line 286 | Line 286 | FastSearchIndexer::FastSearchIndexer(string& datafilen
286              strstream errorMsg;
287   #endif
288              errorMsg << "Fingerprint type '" << fpid << "' not available" << endl;
289 <            obErrorLog.ThrowError(__FUNCTION__, errorMsg.str(), obWarning);
289 >            obErrorLog.ThrowError(__func__, errorMsg.str(), obWarning);
290            }
291  
292          _nbits=FptBits;
# Line 305 | Line 305 | FastSearchIndexer::~FastSearchIndexer()
305          _indexstream->write((const char*)&_pindex->fptdata[0], _pindex->fptdata.size()*sizeof(unsigned int));
306          _indexstream->write((const char*)&_pindex->seekdata[0], _pindex->seekdata.size()*sizeof(unsigned int));
307          if(!_indexstream)
308 <          obErrorLog.ThrowError(__FUNCTION__,
308 >          obErrorLog.ThrowError(__func__,
309                                  "Difficulty writing index", obWarning);
310          delete _pindex;
311   }
# Line 326 | Line 326 | bool FastSearchIndexer::Add(OBBase* pOb, streampos see
326                  _pindex->seekdata.push_back(seekpos);
327                  return true;    
328          }
329 <        obErrorLog.ThrowError(__FUNCTION__, "Failed to make a fingerprint", obWarning);
329 >        obErrorLog.ThrowError(__func__, "Failed to make a fingerprint", obWarning);
330          return false;
331  
332   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines