Browse Source

Merge pull request #266 from RameshRavone/pathch-1

fix shadows template parameter
Bastiaan Olij 6 years ago
parent
commit
971adbd955
1 changed files with 8 additions and 8 deletions
  1. 8 8
      include/core/Basis.hpp

+ 8 - 8
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));
 		}
 	};