diff options
| author |  Bo Yang <teboring@google.com> | 2015-09-15 18:25:02 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2015-10-04 13:22:54 -0700 |
| commit | 7c14dc837b2fcd61ed244ced90debeb4b42d1119 (patch) | |
| tree | ebaea9d0a20b315f4f372136200494d4aff3936c /src/google/protobuf/util/internal/protostream_objectwriter_test.cc | |
| parent | fbabf987e671aa37d11e1163e0175f99b32df5fe (diff) | |
Down-integrate internal bug fixing changes.
Diffstat (limited to 'src/google/protobuf/util/internal/protostream_objectwriter_test.cc')
| -rw-r--r-- | src/google/protobuf/util/internal/protostream_objectwriter_test.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/google/protobuf/util/internal/protostream_objectwriter_test.cc b/src/google/protobuf/util/internal/protostream_objectwriter_test.cc index 96e5ccfb..b2f12217 100644 --- a/src/google/protobuf/util/internal/protostream_objectwriter_test.cc +++ b/src/google/protobuf/util/internal/protostream_objectwriter_test.cc @@ -156,7 +156,12 @@ class BaseProtoStreamObjectWriterTest MATCHER_P(HasObjectLocation, expected, "Verifies the expected object location") { - string actual = std::tr1::get<0>(arg).ToString(); + string actual; +#if __cplusplus >= 201103L + actual = std::get<0>(arg).ToString(); +#else + actual = std::tr1::get<0>(arg).ToString(); +#endif if (actual.compare(expected) == 0) return true; *result_listener << "actual location is: " << actual; return false; |