diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-04-02 18:01:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-02 18:01:15 +0000 |
| commit | 56051569abf447f1e0682072df58f4db046c6520 (patch) | |
| tree | 406b9f87002d9c58f0a458230f83c9e96cdfd3f9 /libs/protoutil/src | |
| parent | 38af02e75b6fa3925cf33186212ae867efe8a58b (diff) | |
| parent | 6cacbcbf436be744a34f7ea0d4f838ff97757446 (diff) | |
Merge "Use modern c++ code style for incidentd." into pi-dev
Diffstat (limited to 'libs/protoutil/src')
| -rw-r--r-- | libs/protoutil/src/ProtoOutputStream.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/protoutil/src/ProtoOutputStream.cpp b/libs/protoutil/src/ProtoOutputStream.cpp index af98a1113228..22b9709ef066 100644 --- a/libs/protoutil/src/ProtoOutputStream.cpp +++ b/libs/protoutil/src/ProtoOutputStream.cpp @@ -175,7 +175,7 @@ ProtoOutputStream::write(uint64_t fieldId, bool val) } bool -ProtoOutputStream::write(uint64_t fieldId, string val) +ProtoOutputStream::write(uint64_t fieldId, std::string val) { if (mCompact) return false; const uint32_t id = (uint32_t)fieldId; |