diff options
| author | 2017-02-25 14:11:44 +1100 | |
|---|---|---|
| committer | 2017-02-25 14:11:44 +1100 | |
| commit | feb7c5dc791e7273967f7b77f0aaf66c8fa4737a (patch) | |
| tree | 574c156e9dcca6d9da2424c4c025a0b38d001dce /3rdparty/glm/test/gtc/gtc_integer.cpp | |
| parent | 8530f35a98b9d89f2874fa47d395b4a55219d479 (diff) | |
Update GLM to tip of stable branch (0.9.8.5 pre-release) - fixes build with MacPorts clang
(nw) In future, could people please use stable branches when updating
3rd-party libraries, not unstable development snapshots? It will help
with stability.
Diffstat (limited to '3rdparty/glm/test/gtc/gtc_integer.cpp')
| -rw-r--r-- | 3rdparty/glm/test/gtc/gtc_integer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/3rdparty/glm/test/gtc/gtc_integer.cpp b/3rdparty/glm/test/gtc/gtc_integer.cpp index 302ceec1a6e..f3d056e2400 100644 --- a/3rdparty/glm/test/gtc/gtc_integer.cpp +++ b/3rdparty/glm/test/gtc/gtc_integer.cpp @@ -1,4 +1,3 @@ -#define GLM_ENABLE_EXPERIMENTAL #define GLM_FORCE_INLINE #include <glm/gtc/epsilon.hpp> #include <glm/gtc/integer.hpp> @@ -94,7 +93,7 @@ namespace log2_ for(std::size_t i = 0; i < Count; ++i) { - glm::vec<4, unsigned long, glm::defaultp> Tmp(glm::uninitialize); + glm::tvec4<unsigned long, glm::defaultp> Tmp(glm::uninitialize); _BitScanReverse(&Tmp.x, i); _BitScanReverse(&Tmp.y, i); _BitScanReverse(&Tmp.z, i); @@ -109,7 +108,7 @@ namespace log2_ { - std::vector<glm::vec<4, unsigned long, glm::defaultp> > Result; + std::vector<glm::tvec4<unsigned long, glm::defaultp> > Result; Result.resize(Count); std::clock_t Begin = clock(); |
