Browse Source

Fixed build on G++

Christophe Riccio 14 years ago
parent
commit
2912e726be
2 changed files with 6 additions and 5 deletions
  1. 1 0
      CMakeLists.txt
  2. 5 5
      glm/core/_swizzle.hpp

+ 1 - 0
CMakeLists.txt

@@ -12,6 +12,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	#add_definitions(-S)
 	#add_definitions(-S)
 	#add_definitions(-s)
 	#add_definitions(-s)
 	add_definitions(-msse2)
 	add_definitions(-msse2)
+	add_definitions(-std=c++0x )
 	#add_definitions(-m32)
 	#add_definitions(-m32)
 	#add_definitions(-mfpmath=387)
 	#add_definitions(-mfpmath=387)
 	#add_definitions(-ffast-math)
 	#add_definitions(-ffast-math)

+ 5 - 5
glm/core/_swizzle.hpp

@@ -159,12 +159,12 @@ namespace detail
 		value_type& operator[]  (size_t i)
 		value_type& operator[]  (size_t i)
 		{
 		{
 			static const int offset_dst[4] = { E0, E1, E2, E3 };
 			static const int offset_dst[4] = { E0, E1, E2, E3 };
-			return elem(offset_dst[i]);
+			return this->elem(offset_dst[i]);
 		}
 		}
-		value_type  operator[]  (size_t) const
+		value_type  operator[]  (size_t i) const
 		{
 		{
 			static const int offset_dst[4] = { E0, E1, E2, E3 };
 			static const int offset_dst[4] = { E0, E1, E2, E3 };
-			return elem(offset_dst[i]);
+			return this->elem(offset_dst[i]);
 		}
 		}
 	protected:
 	protected:
 		template <typename T>
 		template <typename T>
@@ -191,10 +191,10 @@ namespace detail
 		struct Stub {};
 		struct Stub {};
 		_swizzle_base2& operator= (const Stub& that) {}
 		_swizzle_base2& operator= (const Stub& that) {}
 
 
-		value_type  operator[]  (size_t) const
+		value_type  operator[]  (size_t i) const
 		{
 		{
 			static const int offset_dst[4] = { E0, E1, E2, E3 };
 			static const int offset_dst[4] = { E0, E1, E2, E3 };
-			return elem(offset_dst[i]);
+			return this->elem(offset_dst[i]);
 		} 
 		} 
 	};
 	};