diff --git a/HippoMocks/hippomocks.h b/HippoMocks/hippomocks.h index 0c9decd..05c726c 100644 --- a/HippoMocks/hippomocks.h +++ b/HippoMocks/hippomocks.h @@ -140,9 +140,6 @@ class X{}; #pragma warning(disable: 4121) // No deprecated warnings on functions that really aren't deprecated at all. #pragma warning(disable: 4996) - -// Tell Microsoft to conform to C++ (as far as is possible...) -#pragma pointers_to_members(full_generality, virtual_inheritance) #endif #ifndef NO_HIPPOMOCKS_NAMESPACE @@ -1210,7 +1207,7 @@ std::pair virtual_index(T t) unsigned long value; unsigned long baseoffs; } u; - } conv; + } conv = {}; conv.t = t; #if defined(SOME_ARM) // ARM ABI says the bit is in bsaeoffs instead, and that the value is shiffted left 1.