Changing rtti destructor to non-virtual

OpenCyphal · Oct 16, 2024 · d15b180 · d15b180
1 parent 3271390
commit d15b180
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -69,6 +69,10 @@
         "insertable",
         "Kirienko",
         "mainpage",
+        "NOLINT",
+        "NOLINTBEGIN",
+        "NOLINTEND",
+        "NOLINTNEXTLINE",
         "NOTFOUND",
         "opencyphal",
         "Pavel",

diff --git a/cetlvast/suites/docs/CMakeLists.txt b/cetlvast/suites/docs/CMakeLists.txt
@@ -162,9 +162,15 @@ get_property(LOCAL_EXAMPLES DIRECTORY "examples" PROPERTY IN_BUILD_TESTS)
 
 list(TRANSFORM LOCAL_EXAMPLES PREPEND "examples/")
 
+if (NOT DEFINED CETL_PROJECT_VERSION)
+    set(LOCAL_OPEN_CYPHAL_PROJECT_VERSION "0.0.0")
+else()
+    set(LOCAL_OPEN_CYPHAL_PROJECT_VERSION ${CETL_PROJECT_VERSION})
+endif()
+
 create_docs_target( DOCS_DOXY_ROOT ${CMAKE_CURRENT_SOURCE_DIR}
                     OPEN_CYPHAL_PROJECT_NAME "CETL"
-                    OPEN_CYPHAL_PROJECT_VERSION ${CETL_PROJECT_VERSION}
+                    OPEN_CYPHAL_PROJECT_VERSION ${LOCAL_OPEN_CYPHAL_PROJECT_VERSION}
                     OPEN_CYPHAL_PROJECT_NAME_BRIEF
                         "Cyphal Embedded Template Library"
                     EXAMPLES_PATH

diff --git a/include/cetl/rtti.hpp b/include/cetl/rtti.hpp
@@ -236,12 +236,7 @@ class rtti
     /// @}
 
 protected:
-    rtti()                       = default;
-    rtti(const rtti&)            = default;
-    rtti(rtti&&)                 = default;
-    virtual ~rtti() noexcept     = default;
-    rtti& operator=(const rtti&) = default;
-    rtti& operator=(rtti&&)      = default;
+    ~rtti() noexcept             = default;
 };
 
 /// Non-polymorphic types that want to support RTTI should simply provide a \c _get_type_id_()
@@ -290,6 +285,8 @@ struct rtti_helper : public virtual cetl::rtti, public Bases...
     }
     /// @}
 
+    virtual ~rtti_helper() noexcept = default;
+
 private:
     // Exhaustively search for a matching conversion throughout the entire type hierarchy tree.
     // Template parameter pack expansion is not available in C++14 so we do it the hard way.