summaryrefslogtreecommitdiffstats
path: root/include/core
diff options
context:
space:
mode:
authorBastiaan Olij <mux213@gmail.com>2019-04-14 21:25:38 +1000
committerGitHub <noreply@github.com>2019-04-14 21:25:38 +1000
commit971adbd95590d29d17df621d5a04094b173c77f3 (patch)
tree8e286a3becbc1a38a50275302731c205a5ad3143 /include/core
parent834d88a0cd62ec0a508c754e1da4118e113d71b5 (diff)
parenteb7a75b71e28c59bbcd778fe3b82c8c131c77b6b (diff)
downloadredot-cpp-971adbd95590d29d17df621d5a04094b173c77f3.tar.gz
Merge pull request #266 from RameshRavone/pathch-1
fix shadows template parameter
Diffstat (limited to 'include/core')
-rw-r--r--include/core/Basis.hpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/core/Basis.hpp b/include/core/Basis.hpp
index eb1cf76..ebc84f7 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));
}
};