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

Comparing trunk/OOPSE-2.0/src/openbabel/generic.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 960 | Line 960 | bool OBChiralData::SetAtom4Refs(std::vector<unsigned i
960   {
961       if (atom4refs.size()>4)
962         {
963 <         obErrorLog.ThrowError(__FUNCTION__, "More than 4 atoms in atom4refs", obDebug);
963 >         obErrorLog.ThrowError(__func__, "More than 4 atoms in atom4refs", obDebug);
964           return(false);
965         }
966       switch(t){
# Line 968 | Line 968 | bool OBChiralData::SetAtom4Refs(std::vector<unsigned i
968                 case output:_atom4refo = atom4refs;break;
969                 case calcvolume:_atom4refc = atom4refs;break;
970                 default:
971 <                 obErrorLog.ThrowError(__FUNCTION__, "AtomRefType called is invalid", obDebug);
971 >                 obErrorLog.ThrowError(__func__, "AtomRefType called is invalid", obDebug);
972                   return(false);
973                 }
974       return (true);
# Line 980 | Line 980 | int OBChiralData::AddAtomRef(unsigned int atomref, ato
980                case output: _atom4refo.push_back(atomref);break;
981                case calcvolume:_atom4refc.push_back(atomref);break;
982                default:
983 <                 obErrorLog.ThrowError(__FUNCTION__, "AtomRefType called is invalid", obDebug);
983 >                 obErrorLog.ThrowError(__func__, "AtomRefType called is invalid", obDebug);
984                   return(false);
985                }
986                
# Line 994 | Line 994 | unsigned int OBChiralData::GetAtomRef(int a, atomrefty
994               case output: return(_atom4refo[a]);break;
995               case calcvolume: return(_atom4refc[a]);break;
996               default:
997 <                 obErrorLog.ThrowError(__FUNCTION__, "AtomRefType called is invalid", obDebug);
997 >                 obErrorLog.ThrowError(__func__, "AtomRefType called is invalid", obDebug);
998                   return(false);
999                }  
1000   }
# Line 1011 | Line 1011 | std::vector<unsigned int> OBChiralData::GetAtom4Refs(a
1011                  return(_atom4refc);
1012                  break;
1013                 default:
1014 <                 obErrorLog.ThrowError(__FUNCTION__, "AtomRefType called is invalid", obDebug);
1014 >                 obErrorLog.ThrowError(__func__, "AtomRefType called is invalid", obDebug);
1015                   return(_atom4refo);
1016              }
1017   }
# Line 1029 | Line 1029 | unsigned int OBChiralData::GetSize(atomreftype t) cons
1029      case calcvolume:
1030        return(unsigned int)_atom4refc.size();
1031      default:
1032 <                 obErrorLog.ThrowError(__FUNCTION__, "AtomRefType called is invalid", obDebug);
1032 >                 obErrorLog.ThrowError(__func__, "AtomRefType called is invalid", obDebug);
1033                   return(0);
1034      }
1035   }

Diff Legend

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