failed to build on arch64 platform

exclude the files in FilterExpressionParserImpl Signed-off-by: Chen Lihui <lihui.chen@sony.com>
ros2 · Aug 1, 2022 · 29f4661 · 29f4661
1 parent dc8f24f
commit 29f4661
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 32 deletions.
diff --git a/common_content_filter/CMakeLists.txt b/common_content_filter/CMakeLists.txt
@@ -89,6 +89,9 @@ if(BUILD_TESTING)
   find_package(test_msgs REQUIRED)
   find_package(osrf_testing_tools_cpp REQUIRED)
 
+  file(GLOB_RECURSE EXCLUDE_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/FilterExpressionParserImpl/*.hpp)
+  set(ament_cmake_cpplint_ADDITIONAL_EXCLUDE ${EXCLUDE_FILES})
   ament_lint_auto_find_test_dependencies()
 
   ament_add_gtest(test_api test/test_api.cpp)

diff --git a/common_content_filter/src/FilterExpressionParser.cpp b/common_content_filter/src/FilterExpressionParser.cpp
@@ -24,8 +24,12 @@
 #include <rosidl_typesupport_introspection_c/identifier.h>
 #include <rosidl_typesupport_introspection_c/message_introspection.h>
 
+#include <algorithm>
+#include <limits>
 #include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 #include <rosidl_typesupport_introspection_cpp/identifier.hpp>
 #include <rosidl_typesupport_introspection_cpp/message_introspection.hpp>
 #include <rosidl_typesupport_introspection_cpp/field_types.hpp>
@@ -49,10 +53,10 @@ namespace parser
 
 using namespace tao::TAO_PEGTL_NAMESPACE;  // NOLINT
 
-#include "FilterExpressionParserImpl/rearrange.hpp"
-#include "FilterExpressionParserImpl/literal_values.hpp"
 #include "FilterExpressionParserImpl/identifiers.hpp"
+#include "FilterExpressionParserImpl/literal_values.hpp"
 #include "FilterExpressionParserImpl/parameters.hpp"
+#include "FilterExpressionParserImpl/rearrange.hpp"
 
 // select which rules in the grammar will produce parse tree nodes:
 template<typename Rule>

diff --git a/common_content_filter/src/FilterExpressionParserImpl/identifiers.hpp b/common_content_filter/src/FilterExpressionParserImpl/identifiers.hpp
@@ -20,13 +20,6 @@
  * FilterExpressionParser.hpp file of the parent folder.
  */
 
-#ifndef FILTEREXPRESSIONPARSERIMPL__IDENTIFIERS_HPP_
-#define FILTEREXPRESSIONPARSERIMPL__IDENTIFIERS_HPP_
-
-#include <limits>
-#include <memory>
-#include <string>
-#include <vector>
 struct CurrentIdentifierState
 {
   const rosidl_message_type_support_t * type_support;
@@ -185,5 +178,3 @@ struct identifier_processor
     n->children.clear();
   }
 };
-
-#endif  // FILTEREXPRESSIONPARSERIMPL__IDENTIFIERS_HPP_
diff --git a/common_content_filter/src/FilterExpressionParserImpl/literal_values.hpp b/common_content_filter/src/FilterExpressionParserImpl/literal_values.hpp
@@ -20,10 +20,6 @@
  * FilterExpressionParser.hpp file of the parent folder.
  */
 
-#ifndef FILTEREXPRESSIONPARSERIMPL__LITERAL_VALUES_HPP_
-#define FILTEREXPRESSIONPARSERIMPL__LITERAL_VALUES_HPP_
-
-#include <memory>
 struct literal_value_processor
   : parse_tree::apply<literal_value_processor>
 {
@@ -66,5 +62,3 @@ struct literal_value_processor
     n->children.clear();
   }
 };
-
-#endif  // FILTEREXPRESSIONPARSERIMPL__LITERAL_VALUES_HPP_
diff --git a/common_content_filter/src/FilterExpressionParserImpl/parameters.hpp b/common_content_filter/src/FilterExpressionParserImpl/parameters.hpp
@@ -20,10 +20,6 @@
  * FilterExpressionParser.hpp file of the parent folder.
  */
 
-#ifndef FILTEREXPRESSIONPARSERIMPL__PARAMETERS_HPP_
-#define FILTEREXPRESSIONPARSERIMPL__PARAMETERS_HPP_
-
-#include <memory>
 struct parameter_processor
   : parse_tree::apply<parameter_processor>
 {
@@ -39,5 +35,3 @@ struct parameter_processor
     }
   }
 };
-
-#endif  // FILTEREXPRESSIONPARSERIMPL__PARAMETERS_HPP_
diff --git a/common_content_filter/src/FilterExpressionParserImpl/rearrange.hpp b/common_content_filter/src/FilterExpressionParserImpl/rearrange.hpp
@@ -20,13 +20,6 @@
  * FilterExpressionParser.hpp file of the parent folder.
  */
 
-#ifndef FILTEREXPRESSIONPARSERIMPL__REARRANGE_HPP_
-#define FILTEREXPRESSIONPARSERIMPL__REARRANGE_HPP_
-
-#include <algorithm>
-#include <memory>
-#include <utility>
-
 // after a node is stored successfully, you can add an optional transformer like this:
 struct rearrange
   : parse_tree::apply<rearrange>      // allows bulk selection, see selector<...>
@@ -72,5 +65,3 @@ struct rearrange
     }
   }
 };
-
-#endif  // FILTEREXPRESSIONPARSERIMPL__REARRANGE_HPP_