From 81c52c10ba516e16d79dcc2aad99f3ce5434f7eb Mon Sep 17 00:00:00 2001 From: Andrea Gilardoni Date: Tue, 11 Mar 2025 14:23:36 +0100 Subject: [PATCH] changing namespace for timedAttempt to avoid conflicts with time() --- extras/test/src/time/test_TimedAttempt.cpp | 2 +- src/Arduino_TimedAttempt.h | 2 +- src/time/TimedAttempt.cpp | 4 ++-- src/time/TimedAttempt.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extras/test/src/time/test_TimedAttempt.cpp b/extras/test/src/time/test_TimedAttempt.cpp index 8009492..0a8fa71 100644 --- a/extras/test/src/time/test_TimedAttempt.cpp +++ b/extras/test/src/time/test_TimedAttempt.cpp @@ -14,7 +14,7 @@ #include #include -using namespace arduino::time; +using namespace arduino::tattempt; SCENARIO("Test broker connection retries") { TimedAttempt _connection_attempt(0,0); diff --git a/src/Arduino_TimedAttempt.h b/src/Arduino_TimedAttempt.h index 6512dc1..eaa359f 100644 --- a/src/Arduino_TimedAttempt.h +++ b/src/Arduino_TimedAttempt.h @@ -11,4 +11,4 @@ #include "./time/TimedAttempt.h" -using namespace arduino::time; +using namespace arduino::tattempt; diff --git a/src/time/TimedAttempt.cpp b/src/time/TimedAttempt.cpp index 4a0eee8..2d72fda 100644 --- a/src/time/TimedAttempt.cpp +++ b/src/time/TimedAttempt.cpp @@ -12,7 +12,7 @@ #include #include "TimedAttempt.h" -namespace arduino { namespace time { +namespace arduino { namespace tattempt { TimedAttempt::TimedAttempt(unsigned long minDelay, unsigned long maxDelay) : _minDelay(minDelay) @@ -75,4 +75,4 @@ namespace arduino { namespace time { return _retryDelay; } -}} // arduino::time +}} // arduino::tattempt diff --git a/src/time/TimedAttempt.h b/src/time/TimedAttempt.h index 523733d..c5d67de 100644 --- a/src/time/TimedAttempt.h +++ b/src/time/TimedAttempt.h @@ -10,7 +10,7 @@ #pragma once -namespace arduino { namespace time { +namespace arduino { namespace tattempt { /** * The TimedAttempt class manages retry attempts with configurable delays. @@ -97,4 +97,4 @@ namespace arduino { namespace time { unsigned int _retryCount; }; -}} // arduino::time +}} // arduino::tattempt