summaryrefslogtreecommitdiff
path: root/security/certificate-transparency/files/patch-cpp-log-logged_entry.h
blob: 2194fa5ccfaf688fa4cebbe3e117bcbaf9e91568 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
Obtained from:	https://github.com/google/certificate-transparency/commit/6776cc2c4cca665c088019d40f9587189a5d687d

--- cpp/log/logged_entry.h.orig
+++ cpp/log/logged_entry.h
@@ -25,9 +25,7 @@ class LoggedEntry : private ct::LoggedEntryPB {
   using LoggedEntryPB::merkle_leaf_hash;
   using LoggedEntryPB::set_merkle_leaf_hash;
   using LoggedEntryPB::set_sequence_number;
-  void CopyFrom(const ::google::protobuf::Message& from) {
-    LoggedEntryPB::CopyFrom(from);
-  }
+  using LoggedEntryPB::CopyFrom;
   void CopyFrom(const LoggedEntry& from) {
     LoggedEntryPB::CopyFrom(from);
   }