From 051dd08cc84465c16616081473fe60aadf8af0f8 Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Mon, 18 Mar 2024 15:36:52 +0100 Subject: [PATCH] remove disable asan again --- .../re_types_builder/src/codegen/cpp/mod.rs | 20 ++----------------- .../rerun/blueprint/components/active_tab.hpp | 3 +-- .../blueprint/components/included_content.hpp | 3 +-- .../components/included_space_view.hpp | 3 +-- .../blueprint/components/panel_expanded.hpp | 3 +-- .../blueprint/components/query_expression.hpp | 3 +-- .../blueprint/components/root_container.hpp | 3 +-- .../blueprint/components/space_view_class.hpp | 3 +-- .../components/space_view_maximized.hpp | 3 +-- .../components/space_view_origin.hpp | 3 +-- .../components/viewer_recommendation_hash.hpp | 3 +-- .../components/visible_time_range.hpp | 3 +-- rerun_cpp/src/rerun/compiler_utils.hpp | 9 --------- rerun_cpp/src/rerun/components/class_id.hpp | 3 +-- rerun_cpp/src/rerun/components/color.hpp | 3 +-- .../src/rerun/components/half_sizes2d.hpp | 3 +-- .../src/rerun/components/half_sizes3d.hpp | 3 +-- .../src/rerun/components/keypoint_id.hpp | 3 +-- rerun_cpp/src/rerun/components/material.hpp | 3 +-- rerun_cpp/src/rerun/components/media_type.hpp | 3 +-- .../src/rerun/components/mesh_properties.hpp | 3 +-- rerun_cpp/src/rerun/components/name.hpp | 3 +-- .../components/out_of_tree_transform3d.hpp | 3 +-- .../rerun/components/pinhole_projection.hpp | 3 +-- rerun_cpp/src/rerun/components/position2d.hpp | 3 +-- rerun_cpp/src/rerun/components/position3d.hpp | 3 +-- rerun_cpp/src/rerun/components/resolution.hpp | 3 +-- rerun_cpp/src/rerun/components/rotation3d.hpp | 3 +-- .../src/rerun/components/tensor_data.hpp | 3 +-- rerun_cpp/src/rerun/components/texcoord2d.hpp | 3 +-- rerun_cpp/src/rerun/components/text.hpp | 3 +-- .../src/rerun/components/text_log_level.hpp | 3 +-- .../src/rerun/components/transform3d.hpp | 3 +-- rerun_cpp/src/rerun/components/vector2d.hpp | 3 +-- rerun_cpp/src/rerun/components/vector3d.hpp | 3 +-- .../generated/components/affix_fuzzer1.hpp | 3 +-- .../generated/components/affix_fuzzer14.hpp | 3 +-- .../generated/components/affix_fuzzer19.hpp | 3 +-- .../generated/components/affix_fuzzer2.hpp | 3 +-- .../generated/components/affix_fuzzer20.hpp | 3 +-- .../generated/components/affix_fuzzer21.hpp | 3 +-- .../generated/components/affix_fuzzer3.hpp | 3 +-- 42 files changed, 42 insertions(+), 107 deletions(-) diff --git a/crates/re_types_builder/src/codegen/cpp/mod.rs b/crates/re_types_builder/src/codegen/cpp/mod.rs index 90e16bf6b9091..7787361dbc625 100644 --- a/crates/re_types_builder/src/codegen/cpp/mod.rs +++ b/crates/re_types_builder/src/codegen/cpp/mod.rs @@ -1384,20 +1384,12 @@ fn arrow_data_type_method( return datatype; } }; - let return_type = if is_forwarding { - // Disable asan since we got rather strange spurious ci failure on Linux with these methods: - // Some Linux runs end up spamming `AddressSanitizer:DEADLYSIGNAL` indefinitely with no additional information.1 - hpp_includes.insert_rerun("compiler_utils.hpp"); // RR_DISABLE_ASAN - quote! { RR_DISABLE_ASAN const std::shared_ptr& } - } else { - quote! { const std::shared_ptr& } - }; Method { docs: "Returns the arrow data type this type corresponds to.".into(), declaration: MethodDeclaration { is_static: true, - return_type, + return_type: quote! { const std::shared_ptr& }, name_and_parameters: quote! { arrow_datatype() }, }, definition_body, @@ -1501,14 +1493,6 @@ fn to_arrow_method( return array; } }; - let return_type = if is_forwarding { - // Disable asan since we got rather strange spurious ci failure on Linux with these methods: - // Some Linux runs end up spamming `AddressSanitizer:DEADLYSIGNAL` indefinitely with no additional information.1 - hpp_includes.insert_rerun("compiler_utils.hpp"); // RR_DISABLE_ASAN - quote! { RR_DISABLE_ASAN Result> } - } else { - quote! { Result> } - }; Method { docs: format!( @@ -1517,7 +1501,7 @@ fn to_arrow_method( .into(), declaration: MethodDeclaration { is_static: true, - return_type, + return_type: quote! { Result> }, name_and_parameters: quote! { to_arrow(const #quoted_namespace::#type_ident* instances, size_t num_instances) }, diff --git a/rerun_cpp/src/rerun/blueprint/components/active_tab.hpp b/rerun_cpp/src/rerun/blueprint/components/active_tab.hpp index de79389aebf9a..2cc2eb0aca6ba 100644 --- a/rerun_cpp/src/rerun/blueprint/components/active_tab.hpp +++ b/rerun_cpp/src/rerun/blueprint/components/active_tab.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../../compiler_utils.hpp" #include "../../datatypes/entity_path.hpp" #include "../../result.hpp" @@ -53,7 +52,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.blueprint.components.ActiveTab"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/blueprint/components/included_content.hpp b/rerun_cpp/src/rerun/blueprint/components/included_content.hpp index b3c47ae4d8178..ef2f99dc06b2c 100644 --- a/rerun_cpp/src/rerun/blueprint/components/included_content.hpp +++ b/rerun_cpp/src/rerun/blueprint/components/included_content.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../../compiler_utils.hpp" #include "../../datatypes/entity_path.hpp" #include "../../result.hpp" @@ -54,7 +53,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.blueprint.components.IncludedContent"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/blueprint/components/included_space_view.hpp b/rerun_cpp/src/rerun/blueprint/components/included_space_view.hpp index 0560919e9a072..bf6d7f0f0aece 100644 --- a/rerun_cpp/src/rerun/blueprint/components/included_space_view.hpp +++ b/rerun_cpp/src/rerun/blueprint/components/included_space_view.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../../compiler_utils.hpp" #include "../../datatypes/uuid.hpp" #include "../../result.hpp" @@ -51,7 +50,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.blueprint.components.IncludedSpaceView"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/blueprint/components/panel_expanded.hpp b/rerun_cpp/src/rerun/blueprint/components/panel_expanded.hpp index 089a5e50e5e0f..66afc3479affd 100644 --- a/rerun_cpp/src/rerun/blueprint/components/panel_expanded.hpp +++ b/rerun_cpp/src/rerun/blueprint/components/panel_expanded.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../../compiler_utils.hpp" #include "../../datatypes/bool.hpp" #include "../../result.hpp" @@ -48,7 +47,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.blueprint.components.PanelExpanded"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/blueprint/components/query_expression.hpp b/rerun_cpp/src/rerun/blueprint/components/query_expression.hpp index b9c012ae6522d..e801c9881fcd1 100644 --- a/rerun_cpp/src/rerun/blueprint/components/query_expression.hpp +++ b/rerun_cpp/src/rerun/blueprint/components/query_expression.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../../compiler_utils.hpp" #include "../../datatypes/utf8.hpp" #include "../../result.hpp" @@ -61,7 +60,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.blueprint.components.QueryExpression"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/blueprint/components/root_container.hpp b/rerun_cpp/src/rerun/blueprint/components/root_container.hpp index ee6e95ceb5100..1692645235c78 100644 --- a/rerun_cpp/src/rerun/blueprint/components/root_container.hpp +++ b/rerun_cpp/src/rerun/blueprint/components/root_container.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../../compiler_utils.hpp" #include "../../datatypes/uuid.hpp" #include "../../result.hpp" @@ -50,7 +49,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.blueprint.components.RootContainer"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/blueprint/components/space_view_class.hpp b/rerun_cpp/src/rerun/blueprint/components/space_view_class.hpp index 9863c16248e2c..6ac54e1dcf9ca 100644 --- a/rerun_cpp/src/rerun/blueprint/components/space_view_class.hpp +++ b/rerun_cpp/src/rerun/blueprint/components/space_view_class.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../../compiler_utils.hpp" #include "../../datatypes/utf8.hpp" #include "../../result.hpp" @@ -50,7 +49,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.blueprint.components.SpaceViewClass"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/blueprint/components/space_view_maximized.hpp b/rerun_cpp/src/rerun/blueprint/components/space_view_maximized.hpp index ff97bcdc5a223..847d2dd869284 100644 --- a/rerun_cpp/src/rerun/blueprint/components/space_view_maximized.hpp +++ b/rerun_cpp/src/rerun/blueprint/components/space_view_maximized.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../../compiler_utils.hpp" #include "../../datatypes/uuid.hpp" #include "../../result.hpp" @@ -51,7 +50,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.blueprint.components.SpaceViewMaximized"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/blueprint/components/space_view_origin.hpp b/rerun_cpp/src/rerun/blueprint/components/space_view_origin.hpp index a817a1f9af0e7..258dfe83d326f 100644 --- a/rerun_cpp/src/rerun/blueprint/components/space_view_origin.hpp +++ b/rerun_cpp/src/rerun/blueprint/components/space_view_origin.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../../compiler_utils.hpp" #include "../../datatypes/entity_path.hpp" #include "../../result.hpp" @@ -50,7 +49,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.blueprint.components.SpaceViewOrigin"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/blueprint/components/viewer_recommendation_hash.hpp b/rerun_cpp/src/rerun/blueprint/components/viewer_recommendation_hash.hpp index 7c87402ee50da..f41d0094e6fea 100644 --- a/rerun_cpp/src/rerun/blueprint/components/viewer_recommendation_hash.hpp +++ b/rerun_cpp/src/rerun/blueprint/components/viewer_recommendation_hash.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../../compiler_utils.hpp" #include "../../datatypes/uint64.hpp" #include "../../result.hpp" @@ -50,7 +49,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.blueprint.components.ViewerRecommendationHash"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/blueprint/components/visible_time_range.hpp b/rerun_cpp/src/rerun/blueprint/components/visible_time_range.hpp index 4221aaf3ad1a3..ff40716015b3b 100644 --- a/rerun_cpp/src/rerun/blueprint/components/visible_time_range.hpp +++ b/rerun_cpp/src/rerun/blueprint/components/visible_time_range.hpp @@ -4,7 +4,6 @@ #pragma once #include "../../blueprint/datatypes/visible_time_range.hpp" -#include "../../compiler_utils.hpp" #include "../../result.hpp" #include @@ -41,7 +40,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.blueprint.components.VisibleTimeRange"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/compiler_utils.hpp b/rerun_cpp/src/rerun/compiler_utils.hpp index 89e159bbd56ed..145b6f757a6b3 100644 --- a/rerun_cpp/src/rerun/compiler_utils.hpp +++ b/rerun_cpp/src/rerun/compiler_utils.hpp @@ -52,12 +52,3 @@ #else #define RR_DISABLE_DEPRECATION_WARNING #endif - -// Disable ASAN. -#if defined(__GNUC__) || defined(__clang__) -#define RR_DISABLE_ASAN __attribute__((no_sanitize("address"))) -#elif defined(_MSC_VER) -#define RR_DISABLE_ASAN __declspec(no_sanitize_address) -#else -#define RR_DISABLE_ASAN -#endif diff --git a/rerun_cpp/src/rerun/components/class_id.hpp b/rerun_cpp/src/rerun/components/class_id.hpp index e758008e292a6..958f6d41e7d47 100644 --- a/rerun_cpp/src/rerun/components/class_id.hpp +++ b/rerun_cpp/src/rerun/components/class_id.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/class_id.hpp" #include "../result.hpp" @@ -48,7 +47,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.ClassId"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/color.hpp b/rerun_cpp/src/rerun/components/color.hpp index 2e8978f1f443d..787b1691740c5 100644 --- a/rerun_cpp/src/rerun/components/color.hpp +++ b/rerun_cpp/src/rerun/components/color.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/rgba32.hpp" #include "../result.hpp" @@ -73,7 +72,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.Color"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/half_sizes2d.hpp b/rerun_cpp/src/rerun/components/half_sizes2d.hpp index 8ce454d709206..cb87c85a2cec0 100644 --- a/rerun_cpp/src/rerun/components/half_sizes2d.hpp +++ b/rerun_cpp/src/rerun/components/half_sizes2d.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/vec2d.hpp" #include "../result.hpp" @@ -66,7 +65,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.HalfSizes2D"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/half_sizes3d.hpp b/rerun_cpp/src/rerun/components/half_sizes3d.hpp index bf3bf22b0b145..5288f18bfad24 100644 --- a/rerun_cpp/src/rerun/components/half_sizes3d.hpp +++ b/rerun_cpp/src/rerun/components/half_sizes3d.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/vec3d.hpp" #include "../result.hpp" @@ -70,7 +69,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.HalfSizes3D"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/keypoint_id.hpp b/rerun_cpp/src/rerun/components/keypoint_id.hpp index 0ae2186752046..9e11adf43e4b8 100644 --- a/rerun_cpp/src/rerun/components/keypoint_id.hpp +++ b/rerun_cpp/src/rerun/components/keypoint_id.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/keypoint_id.hpp" #include "../result.hpp" @@ -48,7 +47,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.KeypointId"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/material.hpp b/rerun_cpp/src/rerun/components/material.hpp index 7274fba09296c..0a90982e6d4f0 100644 --- a/rerun_cpp/src/rerun/components/material.hpp +++ b/rerun_cpp/src/rerun/components/material.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/material.hpp" #include "../datatypes/rgba32.hpp" #include "../result.hpp" @@ -58,7 +57,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.Material"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/media_type.hpp b/rerun_cpp/src/rerun/components/media_type.hpp index df3241d704b49..f9f35bd386b7a 100644 --- a/rerun_cpp/src/rerun/components/media_type.hpp +++ b/rerun_cpp/src/rerun/components/media_type.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/utf8.hpp" #include "../result.hpp" @@ -103,7 +102,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.MediaType"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/mesh_properties.hpp b/rerun_cpp/src/rerun/components/mesh_properties.hpp index 9cf1a3ee83ac4..a260c339ce667 100644 --- a/rerun_cpp/src/rerun/components/mesh_properties.hpp +++ b/rerun_cpp/src/rerun/components/mesh_properties.hpp @@ -4,7 +4,6 @@ #pragma once #include "../collection.hpp" -#include "../compiler_utils.hpp" #include "../datatypes/mesh_properties.hpp" #include "../result.hpp" @@ -59,7 +58,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.MeshProperties"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/name.hpp b/rerun_cpp/src/rerun/components/name.hpp index ae04f2da0658b..b8e2db8b05377 100644 --- a/rerun_cpp/src/rerun/components/name.hpp +++ b/rerun_cpp/src/rerun/components/name.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/utf8.hpp" #include "../result.hpp" @@ -60,7 +59,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.Name"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/out_of_tree_transform3d.hpp b/rerun_cpp/src/rerun/components/out_of_tree_transform3d.hpp index c75af549023ff..e2cc49afe6cec 100644 --- a/rerun_cpp/src/rerun/components/out_of_tree_transform3d.hpp +++ b/rerun_cpp/src/rerun/components/out_of_tree_transform3d.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/transform3d.hpp" #include "../result.hpp" @@ -44,7 +43,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.OutOfTreeTransform3D"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/pinhole_projection.hpp b/rerun_cpp/src/rerun/components/pinhole_projection.hpp index ff0a9153d90f1..149a133c98487 100644 --- a/rerun_cpp/src/rerun/components/pinhole_projection.hpp +++ b/rerun_cpp/src/rerun/components/pinhole_projection.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/mat3x3.hpp" #include "../result.hpp" @@ -68,7 +67,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.PinholeProjection"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/position2d.hpp b/rerun_cpp/src/rerun/components/position2d.hpp index 60ca72b6ed7a4..48af39afb780b 100644 --- a/rerun_cpp/src/rerun/components/position2d.hpp +++ b/rerun_cpp/src/rerun/components/position2d.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/vec2d.hpp" #include "../result.hpp" @@ -63,7 +62,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.Position2D"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/position3d.hpp b/rerun_cpp/src/rerun/components/position3d.hpp index da4ff1b565c3a..10f0e4d79a79c 100644 --- a/rerun_cpp/src/rerun/components/position3d.hpp +++ b/rerun_cpp/src/rerun/components/position3d.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/vec3d.hpp" #include "../result.hpp" @@ -67,7 +66,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.Position3D"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/resolution.hpp b/rerun_cpp/src/rerun/components/resolution.hpp index b843128c36830..115d1f7f5510c 100644 --- a/rerun_cpp/src/rerun/components/resolution.hpp +++ b/rerun_cpp/src/rerun/components/resolution.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/vec2d.hpp" #include "../result.hpp" @@ -63,7 +62,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.Resolution"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/rotation3d.hpp b/rerun_cpp/src/rerun/components/rotation3d.hpp index 159a9a7a8d014..869e3ab496618 100644 --- a/rerun_cpp/src/rerun/components/rotation3d.hpp +++ b/rerun_cpp/src/rerun/components/rotation3d.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/rotation3d.hpp" #include "../result.hpp" @@ -53,7 +52,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.Rotation3D"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/tensor_data.hpp b/rerun_cpp/src/rerun/components/tensor_data.hpp index 023da7502c9ef..cbf7dc8103219 100644 --- a/rerun_cpp/src/rerun/components/tensor_data.hpp +++ b/rerun_cpp/src/rerun/components/tensor_data.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/tensor_data.hpp" #include "../result.hpp" @@ -76,7 +75,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.TensorData"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/texcoord2d.hpp b/rerun_cpp/src/rerun/components/texcoord2d.hpp index 7bbddec9ea360..3742e5c2e1b0c 100644 --- a/rerun_cpp/src/rerun/components/texcoord2d.hpp +++ b/rerun_cpp/src/rerun/components/texcoord2d.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/vec2d.hpp" #include "../result.hpp" @@ -78,7 +77,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.Texcoord2D"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/text.hpp b/rerun_cpp/src/rerun/components/text.hpp index dee2307f33f0b..909a7186154f4 100644 --- a/rerun_cpp/src/rerun/components/text.hpp +++ b/rerun_cpp/src/rerun/components/text.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/utf8.hpp" #include "../result.hpp" @@ -60,7 +59,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.Text"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/text_log_level.hpp b/rerun_cpp/src/rerun/components/text_log_level.hpp index a0561fff0e6d2..ada89dcea2648 100644 --- a/rerun_cpp/src/rerun/components/text_log_level.hpp +++ b/rerun_cpp/src/rerun/components/text_log_level.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/utf8.hpp" #include "../result.hpp" @@ -86,7 +85,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.TextLogLevel"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/transform3d.hpp b/rerun_cpp/src/rerun/components/transform3d.hpp index 7c493fa55ca03..a74fc4d47270a 100644 --- a/rerun_cpp/src/rerun/components/transform3d.hpp +++ b/rerun_cpp/src/rerun/components/transform3d.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/transform3d.hpp" #include "../result.hpp" @@ -42,7 +41,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.Transform3D"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/vector2d.hpp b/rerun_cpp/src/rerun/components/vector2d.hpp index a3e2de38b1424..632a411073064 100644 --- a/rerun_cpp/src/rerun/components/vector2d.hpp +++ b/rerun_cpp/src/rerun/components/vector2d.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/vec2d.hpp" #include "../result.hpp" @@ -66,7 +65,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.Vector2D"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/src/rerun/components/vector3d.hpp b/rerun_cpp/src/rerun/components/vector3d.hpp index c71694471634a..238a9b8c1f9a5 100644 --- a/rerun_cpp/src/rerun/components/vector3d.hpp +++ b/rerun_cpp/src/rerun/components/vector3d.hpp @@ -3,7 +3,6 @@ #pragma once -#include "../compiler_utils.hpp" #include "../datatypes/vec3d.hpp" #include "../result.hpp" @@ -70,7 +69,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.components.Vector3D"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/tests/generated/components/affix_fuzzer1.hpp b/rerun_cpp/tests/generated/components/affix_fuzzer1.hpp index 56de3e0a7d632..3ed0013b32510 100644 --- a/rerun_cpp/tests/generated/components/affix_fuzzer1.hpp +++ b/rerun_cpp/tests/generated/components/affix_fuzzer1.hpp @@ -7,7 +7,6 @@ #include #include -#include #include #include @@ -42,7 +41,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.testing.components.AffixFuzzer1"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/tests/generated/components/affix_fuzzer14.hpp b/rerun_cpp/tests/generated/components/affix_fuzzer14.hpp index 022ed5d7bfc1b..26813c9604a21 100644 --- a/rerun_cpp/tests/generated/components/affix_fuzzer14.hpp +++ b/rerun_cpp/tests/generated/components/affix_fuzzer14.hpp @@ -7,7 +7,6 @@ #include #include -#include #include #include @@ -42,7 +41,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.testing.components.AffixFuzzer14"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/tests/generated/components/affix_fuzzer19.hpp b/rerun_cpp/tests/generated/components/affix_fuzzer19.hpp index c2bde6858705d..40397a60865c5 100644 --- a/rerun_cpp/tests/generated/components/affix_fuzzer19.hpp +++ b/rerun_cpp/tests/generated/components/affix_fuzzer19.hpp @@ -9,7 +9,6 @@ #include #include #include -#include #include #include @@ -54,7 +53,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.testing.components.AffixFuzzer19"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/tests/generated/components/affix_fuzzer2.hpp b/rerun_cpp/tests/generated/components/affix_fuzzer2.hpp index f215dae5c1f2f..877cbf1b86f86 100644 --- a/rerun_cpp/tests/generated/components/affix_fuzzer2.hpp +++ b/rerun_cpp/tests/generated/components/affix_fuzzer2.hpp @@ -7,7 +7,6 @@ #include #include -#include #include #include @@ -42,7 +41,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.testing.components.AffixFuzzer2"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/tests/generated/components/affix_fuzzer20.hpp b/rerun_cpp/tests/generated/components/affix_fuzzer20.hpp index 4248ae7cdaa01..676fc3ada5418 100644 --- a/rerun_cpp/tests/generated/components/affix_fuzzer20.hpp +++ b/rerun_cpp/tests/generated/components/affix_fuzzer20.hpp @@ -7,7 +7,6 @@ #include #include -#include #include #include @@ -42,7 +41,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.testing.components.AffixFuzzer20"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/tests/generated/components/affix_fuzzer21.hpp b/rerun_cpp/tests/generated/components/affix_fuzzer21.hpp index 51d379567b2b0..5a3cb1313c818 100644 --- a/rerun_cpp/tests/generated/components/affix_fuzzer21.hpp +++ b/rerun_cpp/tests/generated/components/affix_fuzzer21.hpp @@ -7,7 +7,6 @@ #include #include -#include #include #include @@ -42,7 +41,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.testing.components.AffixFuzzer21"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); } diff --git a/rerun_cpp/tests/generated/components/affix_fuzzer3.hpp b/rerun_cpp/tests/generated/components/affix_fuzzer3.hpp index 605df60e86de5..00f120baa1a67 100644 --- a/rerun_cpp/tests/generated/components/affix_fuzzer3.hpp +++ b/rerun_cpp/tests/generated/components/affix_fuzzer3.hpp @@ -7,7 +7,6 @@ #include #include -#include #include #include @@ -42,7 +41,7 @@ namespace rerun { static constexpr const char Name[] = "rerun.testing.components.AffixFuzzer3"; /// Returns the arrow data type this type corresponds to. - static RR_DISABLE_ASAN const std::shared_ptr& arrow_datatype() { + static const std::shared_ptr& arrow_datatype() { return Loggable::arrow_datatype(); }