Changeset 62 for trunk/src/gl/gl_enum.cc

Timestamp:

05/30/13 16:44:38 (12 years ago)

Author:

epyon

Message:

• type -> etype - to reduce confusion for the compiler

File:

• trunk/src/gl/gl_enum.cc (modified) (3 diffs)

trunk/src/gl/gl_enum.cc

@@ -185 +185 @@
 }
 
-unsigned int nv::type_to_gl_enum( type type )
+unsigned int nv::type_to_gl_enum( etype type )
 {
         switch( type )
@@ -209 +209 @@
 }
 
-nv::type nv::gl_enum_to_type( unsigned int gl_enum )
+nv::etype nv::gl_enum_to_type( unsigned int gl_enum )
 {
         switch( gl_enum )
@@ -229 +229 @@
         case GL_INT_VEC3       : return INT_VECTOR_3;
         case GL_INT_VEC4       : return INT_VECTOR_4;
-        default : return type(0); // TODO: throw!
-        }
-}
+        default : return etype(0); // TODO: throw!
+        }
+}