From f75cd9d4ad442af7b0d9d57c54928a9202b6182c Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Mon, 23 Jun 2014 16:24:00 -0400 Subject: [PATCH] rename GLProgram::operator[]() to GLProgram::get_uniform() --- src/gui/GLProgram.cc | 2 +- src/gui/GLProgram.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/GLProgram.cc b/src/gui/GLProgram.cc index e151a65..fda1175 100644 --- a/src/gui/GLProgram.cc +++ b/src/gui/GLProgram.cc @@ -67,7 +67,7 @@ namespace jes return true; } - GLint GLProgram::operator[](const std::string & uniform_name) + GLint GLProgram::get_uniform(const std::string & uniform_name) { if (m_id > 0u) { diff --git a/src/gui/GLProgram.h b/src/gui/GLProgram.h index 2bb7d01..ca5c143 100644 --- a/src/gui/GLProgram.h +++ b/src/gui/GLProgram.h @@ -19,7 +19,7 @@ namespace jes bool link(); GLuint get_id() { return m_id; } void use() { glUseProgram(m_id); } - GLint operator[](const std::string & uniform_name); + GLint get_uniform(const std::string & uniform_name); protected: GLuint m_id; std::map m_uniforms;