From 6f6b06f392125103f092b5b89799b6d69cb69c2b Mon Sep 17 00:00:00 2001 From: ExMix Date: Thu, 26 Dec 2013 18:59:46 +0300 Subject: [PATCH] [drape] const for parameter --- drape/drape_tests/glfunctions.cpp | 2 +- drape/drape_tests/glmock_functions.hpp | 2 +- drape/drape_tests/uniform_value_tests.cpp | 6 +++--- drape/glfunctions.cpp | 2 +- drape/glfunctions.hpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drape/drape_tests/glfunctions.cpp b/drape/drape_tests/glfunctions.cpp index c6609f8c60..8966b5d375 100644 --- a/drape/drape_tests/glfunctions.cpp +++ b/drape/drape_tests/glfunctions.cpp @@ -168,7 +168,7 @@ void GLFunctions::glUniformValuef(int8_t location, float v1, float v2, float v3, MOCK_CALL(glUniformValuef(location, v1, v2, v3, v4)); } -void GLFunctions::glUniformMatrix4x4Value(int8_t location, float * values) +void GLFunctions::glUniformMatrix4x4Value(int8_t location, const float * values) { MOCK_CALL(glUniformMatrix4x4Value(location, values)); } diff --git a/drape/drape_tests/glmock_functions.hpp b/drape/drape_tests/glmock_functions.hpp index c6059002ac..9d2d5652c6 100644 --- a/drape/drape_tests/glmock_functions.hpp +++ b/drape/drape_tests/glmock_functions.hpp @@ -37,7 +37,7 @@ namespace emul MOCK_METHOD3(glUniformValuef, void(int8_t location, float v1, float v2)); MOCK_METHOD4(glUniformValuef, void(int8_t location, float v1, float v2, float v3)); MOCK_METHOD5(glUniformValuef, void(int8_t location, float v1, float v2, float v3, float v4)); - MOCK_METHOD2(glUniformMatrix4x4Value, void(int8_t location, float * values)); + MOCK_METHOD2(glUniformMatrix4x4Value, void(int8_t location, const float * values)); MOCK_METHOD0(glGetCurrentProgram, uint32_t()); MOCK_METHOD1(glCreateShader, uint32_t(glConst type)); diff --git a/drape/drape_tests/uniform_value_tests.cpp b/drape/drape_tests/uniform_value_tests.cpp index 039f399c55..a081eb1ec3 100644 --- a/drape/drape_tests/uniform_value_tests.cpp +++ b/drape/drape_tests/uniform_value_tests.cpp @@ -22,14 +22,14 @@ namespace class MemoryComparer { public: - MemoryComparer(T * memory, uint32_t size) + MemoryComparer(const T * memory, uint32_t size) : m_result(false) , m_memory(memory) , m_size(size) { } - void Compare(int32_t id, T * memory) + void Compare(int32_t id, const T * memory) { m_result = memcmp(m_memory, memory, m_size) == 0; } @@ -41,7 +41,7 @@ namespace private: bool m_result; - T * m_memory; + const T * m_memory; uint32_t m_size; }; } diff --git a/drape/glfunctions.cpp b/drape/glfunctions.cpp index b794140d3b..595bb01bc6 100644 --- a/drape/glfunctions.cpp +++ b/drape/glfunctions.cpp @@ -395,7 +395,7 @@ void GLFunctions::glUniformValuef(int8_t location, float v1, float v2, float v3, GLCHECK(glUniform4fFn(location, v1, v2, v3, v4)); } -void GLFunctions::glUniformMatrix4x4Value(int8_t location, float * values) +void GLFunctions::glUniformMatrix4x4Value(int8_t location, const float * values) { ASSERT(glUniformMatrix4fvFn != NULL, ()); ASSERT(location != -1, ()); diff --git a/drape/glfunctions.hpp b/drape/glfunctions.hpp index d7f3f49009..64c3b30861 100644 --- a/drape/glfunctions.hpp +++ b/drape/glfunctions.hpp @@ -68,7 +68,7 @@ public: static void glUniformValuef(int8_t location, float v1, float v2, float v3); static void glUniformValuef(int8_t location, float v1, float v2, float v3, float v4); - static void glUniformMatrix4x4Value(int8_t location, float * values); + static void glUniformMatrix4x4Value(int8_t location, const float *values); static uint32_t glGetCurrentProgram();