diff options
| author | Andrew Scull <ascull@google.com> | 2018-07-16 16:42:57 +0100 |
|---|---|---|
| committer | Andrew Scull <ascull@google.com> | 2018-07-16 16:49:58 +0000 |
| commit | 3b9cb9c6c6fa416883cb493547731626577fc729 (patch) | |
| tree | a8dbdde8e737cfd88daf02392002af2a339311c4 | |
| parent | 73cd6147931c6f43cfc26df90934ace78c0d5f1f (diff) | |
| parent | af23ae8dd8efc2edbf2295a7430a5bda9295c7a2 (diff) | |
| download | generic-3b9cb9c6c6fa416883cb493547731626577fc729.tar.gz | |
Merge remote-tracking branch 'goog/upstream-master' into nos-merge-16-jul
* goog/upstream-master:
Conform to googletest API changes.
Fix: 111500757
Test: build
Change-Id: Ied373e6de0b93d4c40bbe9f71a896caa34693205
| -rw-r--r-- | libnos/generator/test/test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnos/generator/test/test.cpp b/libnos/generator/test/test.cpp index 75dd7f7..4542c88 100644 --- a/libnos/generator/test/test.cpp +++ b/libnos/generator/test/test.cpp @@ -45,7 +45,7 @@ MATCHER_P(ProtoMessageEq, msg, "") { return MessageDifferencer::Equals(arg, msg) // Check the message is the same rather than the encoded bytes as different // bytes could decode to the same message. MATCHER_P(DecodesToProtoMessage, msg, "Vector does not decode to correct message") { - decltype(msg) decoded; + typename std::remove_const<decltype(msg)>::type decoded; return decoded.ParseFromArray(arg.data(), arg.size()) && MessageDifferencer::Equals(decoded, msg); } |