--- trunk/OOPSE-2.0/src/openbabel/generic.cpp	2005/11/16 19:42:11	2440
+++ trunk/OOPSE-2.0/src/openbabel/generic.cpp	2005/12/16 21:52:50	2518
@@ -960,7 +960,7 @@ bool OBChiralData::SetAtom4Refs(std::vector<unsigned i
 {
      if (atom4refs.size()>4)
        {
-	 obErrorLog.ThrowError(__FUNCTION__, "More than 4 atoms in atom4refs", obDebug);
+	 obErrorLog.ThrowError(__func__, "More than 4 atoms in atom4refs", obDebug);
 	 return(false);
        }
      switch(t){
@@ -968,7 +968,7 @@ bool OBChiralData::SetAtom4Refs(std::vector<unsigned i
                case output:_atom4refo = atom4refs;break;
                case calcvolume:_atom4refc = atom4refs;break;
                default: 
-		 obErrorLog.ThrowError(__FUNCTION__, "AtomRefType called is invalid", obDebug);
+		 obErrorLog.ThrowError(__func__, "AtomRefType called is invalid", obDebug);
 		 return(false);
                }
      return (true);
@@ -980,7 +980,7 @@ int OBChiralData::AddAtomRef(unsigned int atomref, ato
               case output: _atom4refo.push_back(atomref);break;
               case calcvolume:_atom4refc.push_back(atomref);break;
               default:
-		 obErrorLog.ThrowError(__FUNCTION__, "AtomRefType called is invalid", obDebug);
+		 obErrorLog.ThrowError(__func__, "AtomRefType called is invalid", obDebug);
 		 return(false);
               }
               
@@ -994,7 +994,7 @@ unsigned int OBChiralData::GetAtomRef(int a, atomrefty
              case output: return(_atom4refo[a]);break;
              case calcvolume: return(_atom4refc[a]);break;
              default:
-		 obErrorLog.ThrowError(__FUNCTION__, "AtomRefType called is invalid", obDebug);
+		 obErrorLog.ThrowError(__func__, "AtomRefType called is invalid", obDebug);
 		 return(false);
               }  
 }
@@ -1011,7 +1011,7 @@ std::vector<unsigned int> OBChiralData::GetAtom4Refs(a
                 return(_atom4refc);
                 break;
                default:
-		 obErrorLog.ThrowError(__FUNCTION__, "AtomRefType called is invalid", obDebug);
+		 obErrorLog.ThrowError(__func__, "AtomRefType called is invalid", obDebug);
 		 return(_atom4refo);
 	    }
 }
@@ -1029,7 +1029,7 @@ unsigned int OBChiralData::GetSize(atomreftype t) cons
     case calcvolume:
       return(unsigned int)_atom4refc.size();
     default:
-		 obErrorLog.ThrowError(__FUNCTION__, "AtomRefType called is invalid", obDebug);
+		 obErrorLog.ThrowError(__func__, "AtomRefType called is invalid", obDebug);
 		 return(0);
     }
 }