summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/glm/test/bug/bug_ms_vec_static.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-02-25 14:11:44 +1100
committer Vas Crabb <vas@vastheman.com>2017-02-25 14:11:44 +1100
commitfeb7c5dc791e7273967f7b77f0aaf66c8fa4737a (patch)
tree574c156e9dcca6d9da2424c4c025a0b38d001dce /3rdparty/glm/test/bug/bug_ms_vec_static.cpp
parent8530f35a98b9d89f2874fa47d395b4a55219d479 (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/bug/bug_ms_vec_static.cpp')
-rw-r--r--3rdparty/glm/test/bug/bug_ms_vec_static.cpp27
1 files changed, 5 insertions, 22 deletions
diff --git a/3rdparty/glm/test/bug/bug_ms_vec_static.cpp b/3rdparty/glm/test/bug/bug_ms_vec_static.cpp
index 8bc2fadc225..812d97b3cad 100644
--- a/3rdparty/glm/test/bug/bug_ms_vec_static.cpp
+++ b/3rdparty/glm/test/bug/bug_ms_vec_static.cpp
@@ -1,29 +1,12 @@
-#include <glm/glm.hpp>
+#define GLM_FORCE_SWIZZLE
+#include <glm/vec2.hpp>
-#if GLM_HAS_ALIGNED_TYPE
-struct vec2;
-
-struct _swizzle
+struct Foo
{
- char _buffer[1];
-};
-
-struct vec2
-{
- GLM_CONSTEXPR_CTOR vec2() :
- x(0), y(0)
- {}
-
- union
- {
- struct { float x, y; };
- struct { _swizzle xx; };
- };
+ static glm::vec2 Bar;
};
-#endif
-// Visual C++ has a bug generating the error: fatal error C1001: An internal error has occurred in the compiler.
-// vec2 Bar;
+glm::vec2 Foo::Bar = glm::vec2(1.f, 1.f);
int main()
{