diff --git a/CMakeLists.txt b/CMakeLists.txt index e5f3c7be..35ea2cc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) #add_definitions(-S) #add_definitions(-s) add_definitions(-msse2) + add_definitions(-std=c++0x ) #add_definitions(-m32) #add_definitions(-mfpmath=387) #add_definitions(-ffast-math) diff --git a/glm/core/_swizzle.hpp b/glm/core/_swizzle.hpp index 3123277f..331fdcc3 100644 --- a/glm/core/_swizzle.hpp +++ b/glm/core/_swizzle.hpp @@ -159,12 +159,12 @@ namespace detail value_type& operator[] (size_t i) { 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 }; - return elem(offset_dst[i]); + return this->elem(offset_dst[i]); } protected: template @@ -191,10 +191,10 @@ namespace detail struct Stub {}; _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 }; - return elem(offset_dst[i]); + return this->elem(offset_dst[i]); } };