From ff3e1cfafcd25cb2621b0fac7c86e8a2e6d39e68 Mon Sep 17 00:00:00 2001 From: Eunkiki Hong Date: Wed, 21 Aug 2024 01:00:11 +0900 Subject: [PATCH] Resolve Doxygen 1.9.8 error + Fix gcc-14 warning Since doxygen version 1.9.8 is not stable, there are some bugs when we use copydoc for template class. To reduce the fail case minize, let we just remove some inline copydoc keywords. + Remove warning that find_if return value doesn't be used. Change-Id: Ib6eaec6f3ad0462f4e6882402a372bb6361b86e7 Signed-off-by: Eunkiki Hong --- .../adaptor-framework/accessibility-bitset.h | 35 ++++++++++++---------- .../addons/linux/addon-manager-impl-linux.cpp | 8 ++--- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dali/devel-api/adaptor-framework/accessibility-bitset.h b/dali/devel-api/adaptor-framework/accessibility-bitset.h index c54c4b0..55d9b82 100644 --- a/dali/devel-api/adaptor-framework/accessibility-bitset.h +++ b/dali/devel-api/adaptor-framework/accessibility-bitset.h @@ -2,7 +2,7 @@ #define DALI_ADAPTOR_ACCESSIBILITY_BITSET_H /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ namespace Internal { // Number of 32-bit chunks required to hold N bits template>> -inline constexpr std::size_t BitSetSize = (static_cast(EnumMax) + 31u) / 32u; +constexpr std::size_t BitSetSize = (static_cast(EnumMax) + 31u) / 32u; /** * @brief A writable reference to a single bit. @@ -45,12 +45,12 @@ inline constexpr std::size_t BitSetSize = (static_cast(EnumMax) + 3 * @code std::uint32_t x = 0; x[5] = true; @endcode is not possible. The BitSet type uses this proxy * class to make such operations possible. * - * @see Accessibility::BitSet + * @see Dali::Accessibility::BitSet */ class BitReference { template - friend class Accessibility::BitSet; + friend class Dali::Accessibility::BitSet; public: using ElementType = std::uint32_t; ///< Integral type used for storing bits. @@ -126,9 +126,9 @@ class BitSet public: // Types - using ReferenceType = Internal::BitReference; ///< @copybrief Dali::Accessibility::Internal::BitReference - using ElementType = ReferenceType::ElementType; ///< @copydoc Dali::Accessibility::Internal::BitReference::ElementType - using IndexType = ReferenceType::IndexType; ///< @copydoc Dali::Accessibility::Internal::BitReference::IndexType + using ReferenceType = Internal::BitReference; ///< Dali::Accessibility::Internal::BitReference + using ElementType = ReferenceType::ElementType; ///< Dali::Accessibility::Internal::BitReference::ElementType + using IndexType = ReferenceType::IndexType; ///< Dali::Accessibility::Internal::BitReference::IndexType using ArrayType = std::array; ///< An array of N integers that can store 32*N bits. // Constructors @@ -437,16 +437,14 @@ private: * @see Dali::Accessibility::Accessible::GetStates * @see Dali::Accessibility::Accessible::GetRoles */ -template -class EnumBitSet : public BitSet> +template> +class EnumBitSet : public BitSet { - static constexpr std::size_t N = Internal::BitSetSize; - public: // Types - using IndexType = typename BitSet::IndexType; ///< @copydoc Dali::Accessibility::BitSet::IndexType - using ReferenceType = typename BitSet::ReferenceType; ///< @copydoc Dali::Accessibility::BitSet::ReferenceType + using IndexType = typename BitSet::IndexType; ///< Dali::Accessibility::BitSet::IndexType + using ReferenceType = typename BitSet::ReferenceType; ///< Dali::Accessibility::BitSet::ReferenceType // Constructors @@ -487,7 +485,14 @@ public: } /** - * @copydoc Dali::Accessibility::BitSet::operator[](IndexType) const + * @brief Queries the value of the specified bit. + * + * This operator is used in expressions like @code bool b = bitset[i]; @endcode + * + * @note Since doxygen version 1.9.8 (Which is default of Ubuntu24.04) have some bug, copydoc not working. + * + * @param index Index of the bit to query. + * @return true if the specified bit is set to 1, false if it is set to 0. */ bool operator[](Enum index) const { @@ -495,7 +500,7 @@ public: } /** - * @copydoc Dali::Accessibility::BitSet::operator[](IndexType) + * @copydoc Dali::Accessibility::BitSet::operator[]() */ ReferenceType operator[](Enum index) { diff --git a/dali/internal/addons/linux/addon-manager-impl-linux.cpp b/dali/internal/addons/linux/addon-manager-impl-linux.cpp index 2ed12ba..8e7a6d8 100644 --- a/dali/internal/addons/linux/addon-manager-impl-linux.cpp +++ b/dali/internal/addons/linux/addon-manager-impl-linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -77,7 +77,8 @@ std::vector AddOnManagerLinux::EnumerateAddOns() std::vector results; results.emplace_back(); - std::find_if(addonLibsStr.begin(), addonLibsStr.end(), [&results](char& c) { + for(auto&& c : addonLibsStr) + { if(c == ':') { results.emplace_back(); @@ -86,8 +87,7 @@ std::vector AddOnManagerLinux::EnumerateAddOns() { results.back() += c; } - return false; - }); + } const char* EXTENSION_PATH = (addonsPath) ? addonsPath : "/usr/lib"; -- 2.7.4