Skip to content

Commit

Permalink
Removed MSVC pragma to let MSVC choose how to do member function poin…
Browse files Browse the repository at this point in the history
…ters.
  • Loading branch information
PeterBindels-TomTom committed May 31, 2016
1 parent 4a2abad commit 9800b51
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions HippoMocks/hippomocks.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -1210,7 +1207,7 @@ std::pair<int, int> 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.
Expand Down

0 comments on commit 9800b51

Please sign in to comment.