diff options
| author | Colin Cross <ccross@android.com> | 2021-08-26 21:29:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-26 21:29:35 +0000 |
| commit | 8c1d6562996fd78350510c66e282dcb50caa1655 (patch) | |
| tree | 08f815bfcdaed1c2137de2d6966e42a8870dedb0 /tools/cddl/parse.cc | |
| parent | 8beec73fbbcaaab6785c3f9cc5a9661afcbc7fa7 (diff) | |
| parent | 6b563cff6fca9ffdd14a12d33795fef8e2562a26 (diff) | |
| download | openscreen-8c1d6562996fd78350510c66e282dcb50caa1655.tar.gz | |
Upgrade openscreen to f54d92523c9f2c8c5afb99e05fed70e4b8772b1c am: 6b563cff6fandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1
Original change: https://android-review.googlesource.com/c/platform/external/openscreen/+/1810936
Change-Id: I4af446c4bf4a92bc6fe1c6da2ac036a530aee809
Diffstat (limited to 'tools/cddl/parse.cc')
| -rw-r--r-- | tools/cddl/parse.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/cddl/parse.cc b/tools/cddl/parse.cc index eef62976..439df8ff 100644 --- a/tools/cddl/parse.cc +++ b/tools/cddl/parse.cc @@ -10,6 +10,7 @@ #include <iostream> #include <memory> #include <sstream> +#include <utility> #include <vector> #include "absl/strings/ascii.h" @@ -427,7 +428,6 @@ AstNode* ParseGroupChoice(Parser* p) { return nullptr; } } - return nullptr; } AstNode* ParseGroup(Parser* p) { @@ -974,7 +974,7 @@ ParseResult ParseCddl(absl::string_view data) { if (data[0] == 0) { return {nullptr, {}}; } - Parser p{(char*)data.data()}; + Parser p{data.data()}; SkipWhitespace(&p); AstNode* root = nullptr; |