[NXP][common] Replace Optional class with std::optional to fix BR build

chapongatien · chapongatien · commit 4f9c3dd443da · 2024-06-25T17:44:07.000+02:00
Signed-off-by: Gatien Chapon &lt;gatien.chapon@nxp.com&gt;
diff --git a/src/platform/nxp/common/DnssdImpl.cpp b/src/platform/nxp/common/DnssdImpl.cpp
@@ -440,7 +440,7 @@ CHIP_ERROR FromSrpCacheToMdnsData(const otSrpServerService * service, const otSr
     mdnsService.mInterface = ConnectivityManagerImpl().GetThreadInterface();
 
     mdnsService.mAddressType = Inet::IPAddressType::kIPv6;
-    mdnsService.mAddress     = MakeOptional(ToIPAddress(*ip6AddrPtr));
+    mdnsService.mAddress     = std::optional(ToIPAddress(*ip6AddrPtr));
 
     // Extract TXT record SRP service
     txtStringPtr = otSrpServerServiceGetTxtData(service, &txtDataLen);
@@ -547,7 +547,7 @@ CHIP_ERROR FromOtDnsResponseToMdnsData(otDnsServiceInfo & serviceInfo, const cha
     if (!otIp6IsAddressUnspecified(&serviceInfo.mHostAddress))
     {
         mdnsService.mAddressType = Inet::IPAddressType::kIPv6;
-        mdnsService.mAddress     = MakeOptional(ToIPAddress(serviceInfo.mHostAddress));
+        mdnsService.mAddress     = std::optional(ToIPAddress(serviceInfo.mHostAddress));
     }
 
     // Check if TXT record was included in DNS response.

Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ CHIP_ERROR FromSrpCacheToMdnsData(const otSrpServerService * service, const otSr`
`440`	`440`	`mdnsService.mInterface = ConnectivityManagerImpl().GetThreadInterface();`
`441`	`441`
`442`	`442`	`mdnsService.mAddressType = Inet::IPAddressType::kIPv6;`
`443`		`- mdnsService.mAddress = MakeOptional(ToIPAddress(*ip6AddrPtr));`
	`443`	`+ mdnsService.mAddress = std::optional(ToIPAddress(*ip6AddrPtr));`
`444`	`444`
`445`	`445`	`// Extract TXT record SRP service`
`446`	`446`	`txtStringPtr = otSrpServerServiceGetTxtData(service, &txtDataLen);`
`@@ -547,7 +547,7 @@ CHIP_ERROR FromOtDnsResponseToMdnsData(otDnsServiceInfo & serviceInfo, const cha`
`547`	`547`	`if (!otIp6IsAddressUnspecified(&serviceInfo.mHostAddress))`
`548`	`548`	`{`
`549`	`549`	`mdnsService.mAddressType = Inet::IPAddressType::kIPv6;`
`550`		`- mdnsService.mAddress = MakeOptional(ToIPAddress(serviceInfo.mHostAddress));`
	`550`	`+ mdnsService.mAddress = std::optional(ToIPAddress(serviceInfo.mHostAddress));`
`551`	`551`	`}`
`552`	`552`
`553`	`553`	`// Check if TXT record was included in DNS response.`