Rename Buffer to GLBuffer to prevent name conflict.

Diamond/Buffers/GLBuffer.cs

@@ -8,12 +8,12 @@ using OpenTK.Graphics.OpenGL4;
 
 namespace Diamond.Buffers
 {
-    public class Buffer : GLObject
+    public class GLBuffer : GLObject
     {
         public readonly BufferTarget Target;
         public readonly BufferUsageHint Usage;
 
-        public Buffer(BufferTarget target, BufferUsageHint usage = BufferUsageHint.StaticDraw)
+        public GLBuffer(BufferTarget target, BufferUsageHint usage = BufferUsageHint.StaticDraw)
             : base((uint) GL.GenBuffer())
         {
             Target = target;

Diamond/Diamond.csproj

@@ -44,7 +44,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Buffers\Buffer.cs" />
+    <Compile Include="Buffers\GLBuffer.cs" />
     <Compile Include="Buffers\SubArray.cs" />
     <Compile Include="Buffers\VertexDataAttribute.cs" />
     <Compile Include="GLObject.cs" />

Diamond/Shaders/Program.cs

@@ -4,7 +4,6 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Diamond.Buffers;
 using OpenTK.Graphics.OpenGL4;
-using Buffer = Diamond.Buffers.Buffer;
 
 namespace Diamond.Shaders
 {
@@ -88,7 +87,7 @@ namespace Diamond.Shaders
             return id;
         }
 
-        public void SetAttribPointers(Buffer buff, Type vertexType)
+        public void SetAttribPointers(GLBuffer buff, Type vertexType)
         {
             if (vertexType.GetCustomAttributes(typeof(VertexDataAttribute), false).Length == 0)
             {