Function definitions in headers must be declared inline

Signed-off-by: Matthias Kretz <[email protected]>
fair-acc · Oct 1, 2024 · c9ef707 · c9ef707
1 parent 92a08d9
commit c9ef707
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/algorithm/include/gnuradio-4.0/algorithm/ImChart.hpp b/algorithm/include/gnuradio-4.0/algorithm/ImChart.hpp
@@ -119,8 +119,7 @@ enum struct ResetChartView { RESET, KEEP };
 enum class Style { Braille, Bars, Marker };
 
 namespace detail {
-std::vector<std::size_t>
-optimalTickScreenPositions(std::size_t axisWidth, std::size_t minGapSize = 1) {
+inline std::vector<std::size_t> optimalTickScreenPositions(std::size_t axisWidth, std::size_t minGapSize = 1) {
     constexpr std::array preferredDivisors{ 10UZ, 8UZ, 5UZ, 4UZ, 3UZ, 2UZ };
     std::size_t          reducedAxisWidth = axisWidth - 1; // because we always require & add the '0'
 

diff --git a/blocks/soapy/include/gnuradio-4.0/soapy/Soapy.hpp b/blocks/soapy/include/gnuradio-4.0/soapy/Soapy.hpp
@@ -18,7 +18,7 @@
 namespace gr::blocks::soapy {
 
 namespace detail {
-bool equalWithinOnePercent(const std::vector<double>& a, const std::vector<double>& b) {
+inline bool equalWithinOnePercent(const std::vector<double>& a, const std::vector<double>& b) {
     return a.size() == b.size() && std::equal(a.begin(), a.end(), b.begin(), [](double x, double y) { return std::abs(x - y) <= 0.01 * std::max(std::abs(x), std::abs(y)); });
 }
 } // namespace detail

diff --git a/blocks/soapy/include/gnuradio-4.0/soapy/SoapyRaiiWrapper.hpp b/blocks/soapy/include/gnuradio-4.0/soapy/SoapyRaiiWrapper.hpp
@@ -184,7 +184,7 @@ constexpr const char* toSoapySDRFormat() {
     return fmt::format("{}", fmt::join(flagNames, ", "));
 }
 
-void printSoapyReturnDebugInfo(int ret, int flags, long long time_ns) {
+inline void printSoapyReturnDebugInfo(int ret, int flags, long long time_ns) {
     if (ret == SOAPY_SDR_TIMEOUT) {
         fmt::print("TIMEOUT - ");
     } else if (ret < 0) {

diff --git a/core/include/gnuradio-4.0/TriggerMatcher.hpp b/core/include/gnuradio-4.0/TriggerMatcher.hpp
@@ -121,21 +121,21 @@ constexpr const char* kWaitingForStopNonMatch  = "waitingForStopNonMatch";
 constexpr const char* kIsSingleTrigger         = "isSingleTrigger";
 } // namespace key
 
-void reset(property_map& state) noexcept {
+inline void reset(property_map& state) noexcept {
     state[key::kTriggerActive]           = false;
     state[key::kWaitingForStartNonMatch] = false;
     state[key::kWaitingForStopNonMatch]  = false;
 }
 
-[[nodiscard]] bool isSingleTrigger(const property_map& state) noexcept {
+[[nodiscard]] inline bool isSingleTrigger(const property_map& state) noexcept {
     if (state.contains(key::kStartDefined) && state.contains(key::kStopDefined)) {
         return std::get<bool>(state.at(key::kStartDefined)) xor std::get<bool>(state.at(key::kStopDefined));
     } else {
         return false;
     }
 }
 
-void verifyFilterState(std::string_view matchCriteria, property_map& state) {
+inline void verifyFilterState(std::string_view matchCriteria, property_map& state) {
     using namespace std::string_literals;
     using namespace gr::trigger::detail;
     if (state.contains(key::kFilter) && std::holds_alternative<std::string>(state.at(key::kFilter)) && (std::get<std::string>(state.at(key::kFilter)) == matchCriteria)) {
@@ -211,7 +211,7 @@ void verifyFilterState(std::string_view matchCriteria, property_map& state) {
     state[key::kIsSingleTrigger] = bool(std::get<bool>(state.at(key::kStartDefined)) xor std::get<bool>(state.at(key::kStopDefined)));
 }
 
-[[nodiscard]] trigger::MatchResult filter(std::string_view filterDefinition, const Tag& tag, property_map& filterState) {
+[[nodiscard]] inline trigger::MatchResult filter(std::string_view filterDefinition, const Tag& tag, property_map& filterState) {
     using namespace gr::trigger::detail;
     verifyFilterState(filterDefinition, filterState); // N.B. automatically generates config and state variables if needed