SF.net SVN: bzflag:[22788] trunk/bzflag/src/geometry/SphereSceneNode.cxx

[<bul...@us...>]

Revision: 22788
          http://sourceforge.net/p/bzflag/code/22788
Author:   bullet_catcher
Date:     2013-05-31 06:07:58 +0000 (Fri, 31 May 2013)
Log Message:
-----------
Change local variable name from "quad" to "quadric" to avoid confusion with a Solaris typedef.

Modified Paths:
--------------
    trunk/bzflag/src/geometry/SphereSceneNode.cxx

Modified: trunk/bzflag/src/geometry/SphereSceneNode.cxx
===================================================================
--- trunk/bzflag/src/geometry/SphereSceneNode.cxx	2013-05-31 04:48:45 UTC (rev 22787)
+++ trunk/bzflag/src/geometry/SphereSceneNode.cxx	2013-05-31 06:07:58 UTC (rev 22788)
@@ -126,20 +126,20 @@
 {
   GLuint list;
 
-  GLUquadric* quad = gluNewQuadric();
-  gluQuadricDrawStyle(quad, GLU_FILL);
-  gluQuadricTexture(quad, GL_TRUE);
-  gluQuadricNormals(quad, GL_SMOOTH);
-  gluQuadricOrientation(quad, GLU_OUTSIDE);
+  GLUquadric* quadric = gluNewQuadric();
+  gluQuadricDrawStyle(quadric, GLU_FILL);
+  gluQuadricTexture(quadric, GL_TRUE);
+  gluQuadricNormals(quadric, GL_SMOOTH);
+  gluQuadricOrientation(quadric, GLU_OUTSIDE);
 
   list = glGenLists(1);
   glNewList(list, GL_COMPILE);
   {
-    gluSphere(quad, radius, slices, stacks);
+    gluSphere(quadric, radius, slices, stacks);
   }
   glEndList();
 
-  gluDeleteQuadric(quad);
+  gluDeleteQuadric(quadric);
 
   return list;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.