diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-02-02 13:33:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-02 13:33:45 +0100 |
| commit | 63673de247f5ec7c18cdae774523c76347f02053 (patch) | |
| tree | 318ae1df8c9d860b807983882fec84ad0c72e0ca | |
| parent | 86a04198d96820b853bec79165b738a841142768 (diff) | |
| parent | e3cf4726517984ea201ee6aafd54d23e4c086a4b (diff) | |
Merge pull request #7708 from volzhs/match-err
Match ERROR_QUERY_FAILED enum with others
[ci skip]
| -rw-r--r-- | core/error_list.h | 2 | ||||
| -rw-r--r-- | core/global_constants.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/error_list.h b/core/error_list.h index c3cd9b399d..f4063a9285 100644 --- a/core/error_list.h +++ b/core/error_list.h @@ -58,7 +58,7 @@ enum Error { ERR_FILE_EOF, ERR_CANT_OPEN, ///< Can't open a resource/socket/file ERR_CANT_CREATE, // (20) - ERROR_QUERY_FAILED, + ERR_QUERY_FAILED, ERR_ALREADY_IN_USE, ERR_LOCKED, ///< resource is locked ERR_TIMEOUT, diff --git a/core/global_constants.cpp b/core/global_constants.cpp index be619d9ee3..be811ccbd2 100644 --- a/core/global_constants.cpp +++ b/core/global_constants.cpp @@ -434,7 +434,7 @@ static _GlobalConstant _global_constants[]={ BIND_GLOBAL_CONSTANT( ERR_CANT_OPEN ), ///< Can't open a resource/socket/file BIND_GLOBAL_CONSTANT( ERR_CANT_CREATE ), BIND_GLOBAL_CONSTANT( ERR_PARSE_ERROR ), - BIND_GLOBAL_CONSTANT( ERROR_QUERY_FAILED ), + BIND_GLOBAL_CONSTANT( ERR_QUERY_FAILED ), BIND_GLOBAL_CONSTANT( ERR_ALREADY_IN_USE ), BIND_GLOBAL_CONSTANT( ERR_LOCKED ), ///< resource is locked BIND_GLOBAL_CONSTANT( ERR_TIMEOUT ), |