瀏覽代碼

实现点云转换

LiuZe 1 年之前
父節點
當前提交
115ff4c254
共有 2 個文件被更改,包括 10 次插入5 次删除
  1. 10 2
      include/error_code/error_code.hpp
  2. 0 3
      include/rabbitmq/CMakeLists.txt

+ 10 - 2
include/error_code/error_code.hpp

@@ -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;
+        }
     }
 
 

+ 0 - 3
include/rabbitmq/CMakeLists.txt

@@ -4,9 +4,6 @@ unset(OPTION_ENABLE_TEST_CODE CACHE)
 option(OPTION_ENABLE_TEST_CODE "Whether enable test code." OFF)
 message("<=${LIBRARY_NAME}=> test: " ${OPTION_ENABLE_TEST_CODE})
 
-execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/protoc.sh ${CMAKE_CURRENT_LIST_DIR})
-
-
 set(LIBRARY_SOURCE_LIST
     ${CMAKE_CURRENT_LIST_DIR}/rabbitmq_base.h
     ${CMAKE_CURRENT_LIST_DIR}/rabbitmq_base.cpp