Renamed typename to my_typename in index.c since typename is a C++ keyword.
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Sat, 31 Jul 2010 19:52:24 +0000 (21:52 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Sat, 31 Jul 2010 19:52:24 +0000 (21:52 +0200)
src/gmxlib/index.c

index 1a41309aa036b47ab2d74106723f717af8564720..ff4faad92eb8be2d3d24f8c7d8f1b0dc2d577da8 100644 (file)
@@ -571,30 +571,30 @@ gmx_residuetype_get_alltypes(gmx_residuetype_t    rt,
 {
     int      i,j,n;
     int      found;
-    const char **  typename;
+    const char **  my_typename;
     char *   p;
     
     n=0;
     
-    typename=NULL;
+    my_typename=NULL;
     for(i=0;i<rt->n;i++)
     {
         p=rt->restype[i];
         found=0;
         for(j=0;j<n && !found;j++)
         {
-            found=!gmx_strcasecmp(p,typename[j]);
+            found=!gmx_strcasecmp(p,my_typename[j]);
         }
         
         if(!found)
         {
-            srenew(typename,n+1);
-            typename[n]=p;
+            srenew(my_typename,n+1);
+            my_typename[n]=p;
             n++;
         }
     }
     *ntypes=n;
-    *p_typenames=typename; 
+    *p_typenames=my_typename; 
     
     return 0;
 }