From aa5cb98712222e05594dc40a8009de024991c01d Mon Sep 17 00:00:00 2001
From: Yannic Bonenberger <contact@yannic-bonenberger.com>
Date: Wed, 10 Mar 2021 10:05:31 +0100
Subject: [PATCH] Fix conformance_cpp

---
 conformance/conformance_cpp.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conformance/conformance_cpp.cc b/conformance/conformance_cpp.cc
index d27612b151fc..5782789dfdd1 100644
--- a/conformance/conformance_cpp.cc
+++ b/conformance/conformance_cpp.cc
@@ -134,7 +134,7 @@ void DoTest(const ConformanceRequest& request, ConformanceResponse* response) {
                              &proto_binary, options);
       if (!status.ok()) {
         response->set_parse_error(string("Parse error: ") +
-                                  std::string(status.error_message()));
+                                  std::string(status.message()));
         return;
       }
 
@@ -189,7 +189,7 @@ void DoTest(const ConformanceRequest& request, ConformanceResponse* response) {
       if (!status.ok()) {
         response->set_serialize_error(
             string("Failed to serialize JSON output: ") +
-            std::string(status.error_message()));
+            std::string(status.message()));
         return;
       }
       break;