Suppress "Conditional expression is constant" warning on Visual Studio.

2014-01-29 07:29:19 +00:00
parent 35956659ea
commit 41a8bc67ab
4 changed files with 39 additions and 1 deletions
--- a/include/gtest/gtest-printers.h
+++ b/include/gtest/gtest-printers.h
@@ -835,7 +835,9 @@ struct TuplePrefixPrinter {
  template <typename Tuple>
  static void PrintPrefixTo(const Tuple& t, ::std::ostream* os) {
    TuplePrefixPrinter<N - 1>::PrintPrefixTo(t, os);
+    GTEST_INTENTIONAL_CONST_COND_PUSH_
    if (N > 1) {
+    GTEST_INTENTIONAL_CONST_COND_POP_
      *os << ", ";
    }
    UniversalPrinter<