diff options
author | RameshRavone <ramesh.maran443@gmail.com> | 2019-04-12 10:01:44 +0530 |
---|---|---|
committer | RameshRavone <ramesh.maran443@gmail.com> | 2019-04-12 14:52:37 +0530 |
commit | eb7a75b71e28c59bbcd778fe3b82c8c131c77b6b (patch) | |
tree | 625c776b62265e1b5f6bd86c299d78a4b8062739 | |
parent | f0fe88bd36603b5ccb0d1c865e1ad8432dbe3b5e (diff) | |
download | redot-cpp-eb7a75b71e28c59bbcd778fe3b82c8c131c77b6b.tar.gz |
fix shadows template parameter
-rw-r--r-- | include/core/Basis.hpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/core/Basis.hpp b/include/core/Basis.hpp index b559b00..1ab61da 100644 --- a/include/core/Basis.hpp +++ b/include/core/Basis.hpp @@ -22,27 +22,27 @@ private: template <int column> class ColumnVector3 { private: - template <int column, int component> + template <int column1, int component> class ColumnVectorComponent { private: Vector3 elements[3]; protected: - inline ColumnVectorComponent<column, component> &operator=(const ColumnVectorComponent<column, component> &p_value) { + inline ColumnVectorComponent<column1, component> &operator=(const ColumnVectorComponent<column1, component> &p_value) { return *this = real_t(p_value); } - - inline ColumnVectorComponent(const ColumnVectorComponent<column, component> &p_value) { + + inline ColumnVectorComponent(const ColumnVectorComponent<column1, component> &p_value) { *this = real_t(p_value); } - inline ColumnVectorComponent<column, component> &operator=(const real_t &p_value) { - element[component][column] = p_value; + inline ColumnVectorComponent<column1, component> &operator=(const real_t &p_value) { + elements[component][column1] = p_value; return *this; } inline operator real_t() const { - return element[component][column]; + return elements[component][column1]; } }; @@ -271,7 +271,7 @@ private: } inline operator String() const { - return String(Vector3(*this)) + return String(Vector3(*this)); } }; |