|
@@ -913,10 +913,18 @@ public://外部接口函数
|
|
|
}
|
|
|
|
|
|
void compare_and_merge_up(const Error_manager &error) {
|
|
|
-
|
|
|
+ if (error.m_error_level > this->m_error_level) {
|
|
|
+ this->m_error_level = error.m_error_level;
|
|
|
+ this->m_error_code = error.m_error_code;
|
|
|
+ this->m_error_description += error.m_error_description;
|
|
|
+ }
|
|
|
}
|
|
|
void compare_and_merge_down(const Error_manager &error) {
|
|
|
-
|
|
|
+ if (error.m_error_level < this->m_error_level) {
|
|
|
+ this->m_error_level = error.m_error_level;
|
|
|
+ this->m_error_code = error.m_error_code;
|
|
|
+ this->m_error_description += error.m_error_description;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|