ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/openbabel/chains.cpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/openbabel/chains.cpp (file contents):
Revision 2440 by tim, Wed Nov 16 19:42:11 2005 UTC vs.
Revision 2518 by tim, Fri Dec 16 21:52:50 2005 UTC

# Line 371 | Line 371 | static ByteCode *AllocateByteCode(int type)
371      result = (ByteCode*)malloc(sizeof(ByteCode));
372      if( !result )
373      {
374 <      obErrorLog.ThrowError(__FUNCTION__, "Unable to allocate byte codes for biomolecule residue perception.", obError);
374 >      obErrorLog.ThrowError(__func__, "Unable to allocate byte codes for biomolecule residue perception.", obError);
375          //        exit(1);
376      }
377      result->type = type;
# Line 442 | Line 442 | static void FatalMemoryError(void)
442  
443   static void FatalMemoryError(void)
444   {
445 <      obErrorLog.ThrowError(__FUNCTION__, "Unable to allocate memory for biomolecule residue / chain perception.", obError);
445 >      obErrorLog.ThrowError(__func__, "Unable to allocate memory for biomolecule residue / chain perception.", obError);
446      //    exit(1);
447   }
448  
# Line 650 | Line 650 | void GenerateByteCodes(ByteCode **node, int resid, int
650          errorMsg << "Residue " << ChainsResName[resid] << " atom "
651                   << curr << endl;
652          errorMsg << "Previous = " << prev << " Fanout = " << count << endl;
653 <        obErrorLog.ThrowError(__FUNCTION__, errorMsg.str(), obWarning);
653 >        obErrorLog.ThrowError(__func__, errorMsg.str(), obWarning);
654          //        exit(1);
655      }
656      else if( StackPtr )
# Line 946 | Line 946 | bool OBChainsParser::PerceiveChains(OBMol &mol, bool n
946      SetResidueInformation(mol, nukeSingleResidue);
947      CleanupMol();
948  
949 <    obErrorLog.ThrowError(__FUNCTION__,
949 >    obErrorLog.ThrowError(__func__,
950                            "Ran OpenBabel::PerceiveChains", obAuditMsg);
951  
952      return result;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines