Properly namespace nullptr_t.

bzbarsky-apple · bzbarsky-apple · commit 54c7f998ed55 · 2024-03-27T13:07:42.000-04:00
nullptr_t is in namespace std, not just at global level. Fixes project-chip#32749
diff --git 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<OnDeviceConnected> * onConnection,
-                                                nullptr_t
+                                                std::nullptr_t
 #if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
                                                 ,
                                                 uint8_t attemptCount, Callback::Callback<OnDeviceConnectionRetry> * onRetry
diff --git 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<OnDeviceConnected> * onConnection, nullptr_t
+    void FindOrEstablishSession(const ScopedNodeId & peerId, Callback::Callback<OnDeviceConnected> * onConnection, std::nullptr_t
 #if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES
                                 ,
                                 uint8_t attemptCount = 1, Callback::Callback<OnDeviceConnectionRetry> * onRetry = nullptr

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ void CASESessionManager::FindOrEstablishSession(const ScopedNodeId & peerId, Cal`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`void CASESessionManager::FindOrEstablishSession(const ScopedNodeId & peerId, Callback::Callback<OnDeviceConnected> * onConnection,`
`65`		`- nullptr_t`
	`65`	`+ std::nullptr_t`
`66`	`66`	`#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES`
`67`	`67`	`,`
`68`	`68`	`uint8_t attemptCount, Callback::Callback<OnDeviceConnectionRetry> * onRetry`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ class CASESessionManager : public OperationalSessionReleaseDelegate, public Sess`
`135`	`135`	`* @param attemptCount The number of retry attempts if session setup fails (default is 1).`
`136`	`136`	`* @param onRetry A callback to be called on a retry attempt (enabled by a config flag).`
`137`	`137`	`*/`
`138`		`- void FindOrEstablishSession(const ScopedNodeId & peerId, Callback::Callback<OnDeviceConnected> * onConnection, nullptr_t`
	`138`	`+ void FindOrEstablishSession(const ScopedNodeId & peerId, Callback::Callback<OnDeviceConnected> * onConnection, std::nullptr_t`
`139`	`139`	`#if CHIP_DEVICE_CONFIG_ENABLE_AUTOMATIC_CASE_RETRIES`
`140`	`140`	`,`
`141`	`141`	`uint8_t attemptCount = 1, Callback::Callback<OnDeviceConnectionRetry> * onRetry = nullptr`