From e6c414829ba0820a70de7132b6dc34d9a8fcad32 Mon Sep 17 00:00:00 2001 From: Robert Menzel <menzel@informatik.rwth-aachen.de> Date: Tue, 7 Feb 2012 18:16:03 +0100 Subject: [PATCH] overloaded operator removed due to problems with shared pointers --- include/ACGL/OpenGL/Objects/FrameBufferObject.hh | 1 - include/ACGL/OpenGL/Objects/ProgramPipeline.hh | 1 - include/ACGL/OpenGL/Objects/RenderBuffer.hh | 1 - include/ACGL/OpenGL/Objects/Sampler.hh | 1 - include/ACGL/OpenGL/Objects/Shader.hh | 1 - include/ACGL/OpenGL/Objects/ShaderProgram.hh | 1 - include/ACGL/OpenGL/Objects/Texture.hh | 1 - include/ACGL/OpenGL/Objects/VertexArrayObject.hh | 1 - 8 files changed, 8 deletions(-) diff --git a/include/ACGL/OpenGL/Objects/FrameBufferObject.hh b/include/ACGL/OpenGL/Objects/FrameBufferObject.hh index 1e33cb80..002795bf 100644 --- a/include/ACGL/OpenGL/Objects/FrameBufferObject.hh +++ b/include/ACGL/OpenGL/Objects/FrameBufferObject.hh @@ -92,7 +92,6 @@ public: // ============================================================================================ GETTERS \/ // ==================================================================================================== \/ public: - inline GLuint operator() (void) const { return mObjectName; } inline GLuint getObjectName (void) const { return mObjectName; } inline const AttachmentVec& getColorAttachments (void) const { return mColorAttachments; } inline const Attachment& getDepthAttachment (void) const { return mDepthAttachment; } diff --git a/include/ACGL/OpenGL/Objects/ProgramPipeline.hh b/include/ACGL/OpenGL/Objects/ProgramPipeline.hh index c525a48e..cf70a8d2 100644 --- a/include/ACGL/OpenGL/Objects/ProgramPipeline.hh +++ b/include/ACGL/OpenGL/Objects/ProgramPipeline.hh @@ -41,7 +41,6 @@ public: // ============================================================================================ GETTERS \/ // ==================================================================================================== \/ public: - inline GLuint operator() (void) const { return mObjectName; } inline GLuint getObjectName(void) const { return mObjectName; } // ===================================================================================================== \/ diff --git a/include/ACGL/OpenGL/Objects/RenderBuffer.hh b/include/ACGL/OpenGL/Objects/RenderBuffer.hh index d88d3fbf..befd770f 100644 --- a/include/ACGL/OpenGL/Objects/RenderBuffer.hh +++ b/include/ACGL/OpenGL/Objects/RenderBuffer.hh @@ -52,7 +52,6 @@ public: // ============================================================================================ GETTERS \/ // ==================================================================================================== \/ public: - inline GLuint operator() (void) const { return mObjectName; } inline GLuint getObjectName (void) const { return mObjectName; } inline GLenum getInternalFormat (void) const { return mInternalFormat; } inline GLsizei getWidth (void) const { return mWidth; } diff --git a/include/ACGL/OpenGL/Objects/Sampler.hh b/include/ACGL/OpenGL/Objects/Sampler.hh index 4c37f15e..1082dbac 100644 --- a/include/ACGL/OpenGL/Objects/Sampler.hh +++ b/include/ACGL/OpenGL/Objects/Sampler.hh @@ -33,7 +33,6 @@ public: // ============================================================================================ GETTERS \/ // ==================================================================================================== \/ public: - inline GLuint operator() (void) const { return mObjectName; } inline GLuint getObjectName(void) const { return mObjectName; } // ===================================================================================================== \/ diff --git a/include/ACGL/OpenGL/Objects/Shader.hh b/include/ACGL/OpenGL/Objects/Shader.hh index fff6b9b2..be42a9b7 100644 --- a/include/ACGL/OpenGL/Objects/Shader.hh +++ b/include/ACGL/OpenGL/Objects/Shader.hh @@ -51,7 +51,6 @@ public: // ============================================================================================ GETTERS \/ // ==================================================================================================== \/ public: - inline GLuint operator() (void) const { return mObjectName; } inline GLuint getObjectName(void) const { return mObjectName; } inline GLenum getType (void) const { return mType; } diff --git a/include/ACGL/OpenGL/Objects/ShaderProgram.hh b/include/ACGL/OpenGL/Objects/ShaderProgram.hh index 7e8b3990..be020ed2 100644 --- a/include/ACGL/OpenGL/Objects/ShaderProgram.hh +++ b/include/ACGL/OpenGL/Objects/ShaderProgram.hh @@ -85,7 +85,6 @@ public: // ============================================================================================ GETTERS \/ // ==================================================================================================== \/ public: - inline GLuint operator() (void) const { return mObjectName; } inline GLuint getObjectName(void) const { return mObjectName; } inline const ConstSharedShaderVec& getShaders (void) const { return mShaders; } diff --git a/include/ACGL/OpenGL/Objects/Texture.hh b/include/ACGL/OpenGL/Objects/Texture.hh index 540e8c64..19c37fc6 100644 --- a/include/ACGL/OpenGL/Objects/Texture.hh +++ b/include/ACGL/OpenGL/Objects/Texture.hh @@ -66,7 +66,6 @@ public: // ============================================================================================ GETTERS \/ // ==================================================================================================== \/ public: - inline GLuint operator() (void) const { return mObjectName; } inline GLuint getObjectName (void) const { return mObjectName; } inline GLenum getTarget (void) const { return mTarget; } inline GLsizei getWidth (void) const { return mWidth; } diff --git a/include/ACGL/OpenGL/Objects/VertexArrayObject.hh b/include/ACGL/OpenGL/Objects/VertexArrayObject.hh index 318a291d..13886984 100755 --- a/include/ACGL/OpenGL/Objects/VertexArrayObject.hh +++ b/include/ACGL/OpenGL/Objects/VertexArrayObject.hh @@ -93,7 +93,6 @@ public: // ============================================================================================ GETTERS \/ // ==================================================================================================== \/ public: - inline GLuint operator() (void) const { return mObjectName; } inline GLuint getObjectName(void) const { return mObjectName; } inline const AttributeVec& getAttributes(void) const { return mAttributes; } inline GLenum getMode (void) const { return mMode; } -- GitLab