mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-23 01:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build on G++

Browse Source
This commit is contained in:
Christophe Riccio 2011-09-24 13:40:55 +01:00
parent 1e8802fa47
commit 2912e726be
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -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)

10
glm/core/_swizzle.hpp
View File

@ -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]);
} }
}; };