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

Comparing trunk/OOPSE-4/src/openbabel/kekulize.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 162 | Line 162 | void OBMol::NewPerceiveKekuleBonds()
162          }
163          if (bestorden==99) {  // no electron giving atom found
164            errorMsg << "Kekulize: Huckel rule not satisfied for molecule " << GetTitle() << endl;
165 <          obErrorLog.ThrowError(__FUNCTION__, errorMsg.str(), obInfo);
165 >          obErrorLog.ThrowError(__func__, errorMsg.str(), obInfo);
166            break;             // Huckel rule cannot be satisfied
167          }                    // try to kekulize anyway
168          else {
# Line 189 | Line 189 | void OBMol::NewPerceiveKekuleBonds()
189            }
190            if (bestorden==99) {  // no electron giving atom found
191              errorMsg << "Kekulize: Cannot get an even number of electron for molecule " << GetTitle() << "\n";
192 <          obErrorLog.ThrowError(__FUNCTION__, errorMsg.str(), obInfo);
192 >          obErrorLog.ThrowError(__func__, errorMsg.str(), obInfo);
193              break;             // impossible to choose an atom to obtain an even number of electron
194            }                    // try to kekulize anyway
195            else {
# Line 338 | Line 338 | void OBMol::start_kekulize( std::vector <OBAtom*> &cyc
338      strstream errorMsg;
339   #endif
340      errorMsg << "Kekulize Error for molecule " << GetTitle() << endl;
341 <    obErrorLog.ThrowError(__FUNCTION__, errorMsg.str(), obInfo);
341 >    obErrorLog.ThrowError(__func__, errorMsg.str(), obInfo);
342      }
343  
344    // Set the double bonds
# Line 418 | Line 418 | int OBMol::expand_kekulize(OBAtom *atom1, OBAtom *atom
418  
419      errorMsg << "unexpected state:" << "atom " << Idx1 << " " << currentState[Idx1]
420           << " atom " << Idx2 << " " << currentState[Idx2] << endl;
421 <    obErrorLog.ThrowError(__FUNCTION__, errorMsg.str(), obDebug);
421 >    obErrorLog.ThrowError(__func__, errorMsg.str(), obDebug);
422      return(false);
423    }
424  

Diff Legend

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