aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2016-09-23 23:53:43 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2016-09-23 23:53:43 -0700
commit4d3e4cfa4a1bf01e8a19515967f127ddd4b5cdf3 (patch)
tree56312be0cbdd67b7f99d2e635c682f332c576354
parenta428e42072765993ff674fda72863c9f1aa2d268 (diff)
downloadprotobuf-4d3e4cfa4a1bf01e8a19515967f127ddd4b5cdf3.tar.gz
protobuf-4d3e4cfa4a1bf01e8a19515967f127ddd4b5cdf3.tar.bz2
protobuf-4d3e4cfa4a1bf01e8a19515967f127ddd4b5cdf3.zip
Fix MSVC stack overflow issue.
-rw-r--r--src/google/protobuf/util/internal/json_stream_parser_test.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/google/protobuf/util/internal/json_stream_parser_test.cc b/src/google/protobuf/util/internal/json_stream_parser_test.cc
index 945fc6ca..eaa7e045 100644
--- a/src/google/protobuf/util/internal/json_stream_parser_test.cc
+++ b/src/google/protobuf/util/internal/json_stream_parser_test.cc
@@ -139,7 +139,12 @@ class JsonStreamParserTest : public ::testing::Test {
}
+#ifndef _MSC_VER
+ // TODO(xiaofeng): We have to disable InSequence check for MSVC because it
+ // causes stack overflow due to its use of a linked list that is desctructed
+ // recursively.
::testing::InSequence in_sequence_;
+#endif // !_MSC_VER
MockObjectWriter mock_;
ExpectingObjectWriter ow_;
};