From 2b1bddd60e872f7262723f70ed830827b0e57c13 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 27 Mar 2024 09:55:11 -0400 Subject: [PATCH] Properly namespace nullptr_t. nullptr_t is in namespace std, not just at global level. Fixes https://github.com/project-chip/connectedhomeip/issues/32749 --- src/app/CASESessionManager.cpp | 2 +- src/app/CASESessionManager.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/CASESessionManager.cpp b/src/app/CASESessionManager.cpp index 382d2620fcfa6a..c15ddcabe01c04 100644 --- a/src/app/CASESessionManager.cpp +++ b/src/app/CASESessionManager.cpp @@ -62,7 +62,7 @@ void CASESessionManager::FindOrEstablishSession(const ScopedNodeId & peerId, Cal } void CASESessionManager::FindOrEstablishSession(const ScopedNodeId & peerId, Callback::Callback * onConnection, - nullptr_t + std::nullptr_t #if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES , uint8_t attemptCount, Callback::Callback * onRetry diff --git a/src/app/CASESessionManager.h b/src/app/CASESessionManager.h index 3e668fa905cbdf..e78478852b640e 100644 --- a/src/app/CASESessionManager.h +++ b/src/app/CASESessionManager.h @@ -135,7 +135,7 @@ class CASESessionManager : public OperationalSessionReleaseDelegate, public Sess * @param attemptCount The number of retry attempts if session setup fails (default is 1). * @param onRetry A callback to be called on a retry attempt (enabled by a config flag). */ - void FindOrEstablishSession(const ScopedNodeId & peerId, Callback::Callback * onConnection, nullptr_t + void FindOrEstablishSession(const ScopedNodeId & peerId, Callback::Callback * onConnection, std::nullptr_t #if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES , uint8_t attemptCount = 1, Callback::Callback * onRetry = nullptr