diff options
author | Tao Bao <tbao@google.com> | 2018-07-10 18:50:33 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-07-10 18:50:33 +0200 |
commit | d8a2c2682a87dcd0d77708333a46a0472b403c9b (patch) | |
tree | 28768203f70081c7d5a76e872618ac0da67b735d /edify/expr.cpp | |
parent | Merge "applypatch: Restrict applypatch_check to eMMC targets." (diff) | |
parent | Merge "edify: Remove VAL_INVALID and move ValueType into Value class." (diff) | |
download | android_bootable_recovery-d8a2c2682a87dcd0d77708333a46a0472b403c9b.tar android_bootable_recovery-d8a2c2682a87dcd0d77708333a46a0472b403c9b.tar.gz android_bootable_recovery-d8a2c2682a87dcd0d77708333a46a0472b403c9b.tar.bz2 android_bootable_recovery-d8a2c2682a87dcd0d77708333a46a0472b403c9b.tar.lz android_bootable_recovery-d8a2c2682a87dcd0d77708333a46a0472b403c9b.tar.xz android_bootable_recovery-d8a2c2682a87dcd0d77708333a46a0472b403c9b.tar.zst android_bootable_recovery-d8a2c2682a87dcd0d77708333a46a0472b403c9b.zip |
Diffstat (limited to 'edify/expr.cpp')
-rw-r--r-- | edify/expr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/edify/expr.cpp b/edify/expr.cpp index 6823b7339..c090eb28a 100644 --- a/edify/expr.cpp +++ b/edify/expr.cpp @@ -51,9 +51,9 @@ bool Evaluate(State* state, const std::unique_ptr<Expr>& expr, std::string* resu if (!v) { return false; } - if (v->type != VAL_STRING) { - ErrorAbort(state, kArgsParsingFailure, "expecting string, got value type %d", v->type); - return false; + if (v->type != Value::Type::STRING) { + ErrorAbort(state, kArgsParsingFailure, "expecting string, got value type %d", v->type); + return false; } *result = v->data; @@ -68,7 +68,7 @@ Value* StringValue(const char* str) { if (str == nullptr) { return nullptr; } - return new Value(VAL_STRING, str); + return new Value(Value::Type::STRING, str); } Value* StringValue(const std::string& str) { |