@@ -54,30 +54,30 @@ TEST(VariableReflectionTest, GetDatamembers) {
5454 EXPECT_EQ (datamembers.size (), 3 );
5555 EXPECT_EQ (datamembers1.size (), 0 );
5656}
57-
57+ # pragma warning(disable : 4201)
5858#define CODE \
5959 struct Klass1 { \
60- Klass1 (int i) : num(1 ), foo (i) {} \
60+ Klass1 (int i) : num(1 ), b (i) {} \
6161 int num; \
62- union foo { \
62+ union { \
6363 double a; \
6464 int b; \
6565 }; \
6666 } const k1 (5 ); \
6767 struct Klass2 { \
68- Klass2 (double d) : num(2 ), foo. a(d) {} \
68+ Klass2 (double d) : num(2 ), a(d) {} \
6969 int num; \
70- struct foo { \
70+ struct { \
7171 double a; \
7272 int b; \
7373 }; \
7474 } const k2 (2.5 ); \
7575 struct Klass3 { \
7676 Klass3 (int i) : num(i) {} \
7777 int num; \
78- struct foo { \
78+ struct { \
7979 double a; \
80- union bar { \
80+ union { \
8181 float b; \
8282 int c; \
8383 }; \
@@ -112,25 +112,26 @@ TEST(VariableReflectionTest, DatamembersWithAnonymousStructOrUnion) {
112112
113113 EXPECT_EQ (Cpp::GetVariableOffset (datamembers_klass1[0 ]), 0 );
114114 EXPECT_EQ (Cpp::GetVariableOffset (datamembers_klass1[1 ]),
115- ((intptr_t ) & (k1.foo . a )) - ((intptr_t ) & (k1.num )));
115+ ((intptr_t ) & (k1.a )) - ((intptr_t ) & (k1.num )));
116116 EXPECT_EQ (Cpp::GetVariableOffset (datamembers_klass1[2 ]),
117- ((intptr_t ) & (k1.foo . b )) - ((intptr_t ) & (k1.num )));
117+ ((intptr_t ) & (k1.b )) - ((intptr_t ) & (k1.num )));
118118
119119 EXPECT_EQ (Cpp::GetVariableOffset (datamembers_klass2[0 ]), 0 );
120120 EXPECT_EQ (Cpp::GetVariableOffset (datamembers_klass2[1 ]),
121- ((intptr_t ) & (k2.foo . a )) - ((intptr_t ) & (k2.num )));
121+ ((intptr_t ) & (k2.a )) - ((intptr_t ) & (k2.num )));
122122 EXPECT_EQ (Cpp::GetVariableOffset (datamembers_klass2[2 ]),
123- ((intptr_t ) & (k2.foo . b )) - ((intptr_t ) & (k2.num )));
123+ ((intptr_t ) & (k2.b )) - ((intptr_t ) & (k2.num )));
124124
125125 EXPECT_EQ (Cpp::GetVariableOffset (datamembers_klass3[0 ]), 0 );
126126 EXPECT_EQ (Cpp::GetVariableOffset (datamembers_klass3[1 ]),
127- ((intptr_t ) & (k3.foo . a )) - ((intptr_t ) & (k3.num )));
127+ ((intptr_t ) & (k3.a )) - ((intptr_t ) & (k3.num )));
128128 EXPECT_EQ (Cpp::GetVariableOffset (datamembers_klass3[2 ]),
129- ((intptr_t ) & (k3.foo . bar . b )) - ((intptr_t ) & (k3.num )));
129+ ((intptr_t ) & (k3.b )) - ((intptr_t ) & (k3.num )));
130130 EXPECT_EQ (Cpp::GetVariableOffset (datamembers_klass3[3 ]),
131- ((intptr_t ) & (k3.foo . bar . b )) - ((intptr_t ) & (k3.num )));
131+ ((intptr_t ) & (k3.c )) - ((intptr_t ) & (k3.num )));
132132 EXPECT_EQ (Cpp::GetVariableOffset (datamembers_klass3[4 ]),
133133 ((intptr_t ) & (k3.num2 )) - ((intptr_t ) & (k3.num )));
134+ #pragma warning(default : 4201)
134135}
135136
136137TEST (VariableReflectionTest, LookupDatamember) {
0 commit comments