diff options
author | Tao Bao <tbao@google.com> | 2017-10-06 16:51:47 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-06 16:51:47 +0200 |
commit | 3bc65953ab208aa318cc452d4de489e94fbb1428 (patch) | |
tree | 8ee15fecaf5d5f91521718c69ea7d9c0de79681c /edify/expr.h | |
parent | Merge "vr_ui: drawing changes" am: 9a874a4e5f (diff) | |
parent | Merge "Don't include "error_code.h" in edify/expr.h." (diff) | |
download | android_bootable_recovery-3bc65953ab208aa318cc452d4de489e94fbb1428.tar android_bootable_recovery-3bc65953ab208aa318cc452d4de489e94fbb1428.tar.gz android_bootable_recovery-3bc65953ab208aa318cc452d4de489e94fbb1428.tar.bz2 android_bootable_recovery-3bc65953ab208aa318cc452d4de489e94fbb1428.tar.lz android_bootable_recovery-3bc65953ab208aa318cc452d4de489e94fbb1428.tar.xz android_bootable_recovery-3bc65953ab208aa318cc452d4de489e94fbb1428.tar.zst android_bootable_recovery-3bc65953ab208aa318cc452d4de489e94fbb1428.zip |
Diffstat (limited to 'edify/expr.h')
-rw-r--r-- | edify/expr.h | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/edify/expr.h b/edify/expr.h index 4838d20c0..32828028a 100644 --- a/edify/expr.h +++ b/edify/expr.h @@ -23,32 +23,34 @@ #include <string> #include <vector> -#include "error_code.h" +// Forward declaration to avoid including "error_code.h". +enum ErrorCode : int; +enum CauseCode : int; struct State { - State(const std::string& script, void* cookie); + State(const std::string& script, void* cookie); - // The source of the original script. - const std::string& script; + // The source of the original script. + const std::string& script; - // Optional pointer to app-specific data; the core of edify never - // uses this value. - void* cookie; + // Optional pointer to app-specific data; the core of edify never + // uses this value. + void* cookie; - // The error message (if any) returned if the evaluation aborts. - // Should be empty initially, will be either empty or a string that - // Evaluate() returns. - std::string errmsg; + // The error message (if any) returned if the evaluation aborts. + // Should be empty initially, will be either empty or a string that + // Evaluate() returns. + std::string errmsg; - // error code indicates the type of failure (e.g. failure to update system image) - // during the OTA process. - ErrorCode error_code = kNoError; + // error code indicates the type of failure (e.g. failure to update system image) + // during the OTA process. + ErrorCode error_code; - // cause code provides more detailed reason of an OTA failure (e.g. fsync error) - // in addition to the error code. - CauseCode cause_code = kNoCause; + // cause code provides more detailed reason of an OTA failure (e.g. fsync error) + // in addition to the error code. + CauseCode cause_code; - bool is_retry = false; + bool is_retry = false; }; enum ValueType { |