1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp
index f5c7f017..69c7274a 100644
--- a/glm/detail/type_vec1.hpp
+++ b/glm/detail/type_vec1.hpp
@@ -39,6 +39,10 @@ namespace glm
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
# pragma clang diagnostic ignored "-Wnested-anon-types"
+# endif
+# if GLM_COMPILER & GLM_COMPILER_VC
+# pragma warning(push)
+# pragma warning(disable: 4201)
# endif
union
@@ -60,6 +64,9 @@ namespace glm
# endif//GLM_SWIZZLE*/
};
+# if GLM_COMPILER & GLM_COMPILER_VC
+# pragma warning(pop)
+# endif
# if GLM_COMPILER & GLM_COMPILER_CLANG
# pragma clang diagnostic pop
# endif
diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp
index a9af32e3..b8b8f32e 100644
--- a/glm/detail/type_vec2.hpp
+++ b/glm/detail/type_vec2.hpp
@@ -38,6 +38,10 @@ namespace glm
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
# pragma clang diagnostic ignored "-Wnested-anon-types"
+# endif
+# if GLM_COMPILER & GLM_COMPILER_VC
+# pragma warning(push)
+# pragma warning(disable: 4201)
# endif
union
@@ -60,6 +64,9 @@ namespace glm
};
+# if GLM_COMPILER & GLM_COMPILER_VC
+# pragma warning(pop)
+# endif
# if GLM_COMPILER & GLM_COMPILER_CLANG
# pragma clang diagnostic pop
# endif
diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp
index f85f0a5c..28e6c6ed 100644
--- a/glm/detail/type_vec3.hpp
+++ b/glm/detail/type_vec3.hpp
@@ -38,6 +38,10 @@ namespace glm
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
# pragma clang diagnostic ignored "-Wnested-anon-types"
+# endif
+# if GLM_COMPILER & GLM_COMPILER_VC
+# pragma warning(push)
+# pragma warning(disable: 4201)
# endif
union
@@ -59,6 +63,9 @@ namespace glm
# endif//GLM_SWIZZLE
};
+# if GLM_COMPILER & GLM_COMPILER_VC
+# pragma warning(pop)
+# endif
# if GLM_COMPILER & GLM_COMPILER_CLANG
# pragma clang diagnostic pop
# endif
diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp
index 5e89b744..0a16bc2c 100644
--- a/glm/detail/type_vec4.hpp
+++ b/glm/detail/type_vec4.hpp
@@ -38,6 +38,10 @@ namespace glm
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
# pragma clang diagnostic ignored "-Wnested-anon-types"
+# endif
+# if GLM_COMPILER & GLM_COMPILER_VC
+# pragma warning(push)
+# pragma warning(disable: 4201)
# endif
union
@@ -61,6 +65,9 @@ namespace glm
# endif//GLM_SWIZZLE
};
+# if GLM_COMPILER & GLM_COMPILER_VC
+# pragma warning(pop)
+# endif
# if GLM_COMPILER & GLM_COMPILER_CLANG
# pragma clang diagnostic pop
# endif
diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp
index 8af1c8bf..ff8c4aa6 100644
--- a/glm/gtc/quaternion.hpp
+++ b/glm/gtc/quaternion.hpp
@@ -49,6 +49,10 @@ namespace glm
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
# pragma clang diagnostic ignored "-Wnested-anon-types"
+# endif
+# if GLM_COMPILER & GLM_COMPILER_VC
+# pragma warning(push)
+# pragma warning(disable: 4201)
# endif
union
@@ -57,6 +61,9 @@ namespace glm
typename detail::storage<T, sizeof(T) * 4, detail::is_aligned<P>::value>::type data;
};
+# if GLM_COMPILER & GLM_COMPILER_VC
+# pragma warning(pop)
+# endif
# if GLM_COMPILER & GLM_COMPILER_CLANG
# pragma clang diagnostic pop
# endif
--
2.15.1.windows.2
|
