diff options
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 6 | 
1 files changed, 6 insertions, 0 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index 37ceb549..030a1d61 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -48,6 +48,12 @@  namespace testing {  namespace internal { +// Silence C4100 (unreferenced formal +// parameter) for MSVC +#ifdef _MSC_VER +# pragma warning(disable:4100) +#endif +  // Joins a vector of strings as if they are fields of a tuple; returns  // the joined string.  GTEST_API_ std::string JoinAsTuple(const Strings& fields);  | 
