More replacing of std::span with pw::span

project-chip · Jun 30, 2022 · 9904f46 · 9904f46
1 parent eeabe4e
commit 9904f46
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 23 deletions.
diff --git a/examples/common/pigweed/system_rpc_server.cc b/examples/common/pigweed/system_rpc_server.cc
@@ -43,7 +43,7 @@ void Init()
 {
     // Send log messages to HDLC address 1. This prevents logs from interfering
     // with pw_rpc communications.
-    pw::log_basic::SetOutput([](std::string_view log) { pw::hdlc::WriteUIFrame(1, pw::as_bytes(std::span(log)), writer); });
+    pw::log_basic::SetOutput([](std::string_view log) { pw::hdlc::WriteUIFrame(1, pw::as_bytes(pw::span(log)), writer); });
 }
 
 rpc::Server & Server()

diff --git a/examples/platform/ameba/PigweedLogger.cpp b/examples/platform/ameba/PigweedLogger.cpp
@@ -41,7 +41,7 @@ bool uartInitialised;
 
 void send()
 {
-    pw::hdlc::WriteUIFrame(kLogHdlcAddress, pw::as_bytes(std::span(sWriteBuffer, sWriteBufferPos)), sWriter);
+    pw::hdlc::WriteUIFrame(kLogHdlcAddress, pw::as_bytes(pw::span(sWriteBuffer, sWriteBufferPos)), sWriter);
     sWriteBufferPos = 0;
 }
 

diff --git a/examples/platform/ameba/pw_sys_io/sys_io_ameba.cc b/examples/platform/ameba/pw_sys_io/sys_io_ameba.cc
@@ -72,13 +72,13 @@ Status WriteByte(std::byte b)
 StatusWithSize WriteLine(const std::string_view & s)
 {
     size_t chars_written  = 0;
-    StatusWithSize result = WriteBytes(pw::as_bytes(std::span(s)));
+    StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
     if (!result.ok())
     {
         return result;
     }
     chars_written += result.size();
-    result = WriteBytes(pw::as_bytes(std::span("\r\n", 2)));
+    result = WriteBytes(pw::as_bytes(pw::span("\r\n", 2)));
     chars_written += result.size();
 
     return StatusWithSize(result.status(), chars_written);

diff --git a/examples/platform/bouffalolab/bl602/PigweedLogger.cpp b/examples/platform/bouffalolab/bl602/PigweedLogger.cpp
@@ -52,7 +52,7 @@ static char sWriteBuffer[kWriteBufferSize];
 
 static void send(void)
 {
-    pw::hdlc::WriteUIFrame(kLogHdlcAddress, pw::as_bytes(std::span(sWriteBuffer, sWriteBufferPos)), sWriter);
+    pw::hdlc::WriteUIFrame(kLogHdlcAddress, pw::as_bytes(pw::span(sWriteBuffer, sWriteBufferPos)), sWriter);
     sWriteBufferPos = 0;
 }
 

diff --git a/examples/platform/bouffalolab/bl602/pw_sys_io/sys_io_efr32.cc b/examples/platform/bouffalolab/bl602/pw_sys_io/sys_io_efr32.cc
@@ -66,13 +66,13 @@ Status WriteByte(std::byte b)
 StatusWithSize WriteLine(const std::string_view & s)
 {
     size_t chars_written  = 0;
-    StatusWithSize result = WriteBytes(pw::as_bytes(std::span(s)));
+    StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
     if (!result.ok())
     {
         return result;
     }
     chars_written += result.size();
-    result = WriteBytes(pw::as_bytes(std::span("\r\n", 2)));
+    result = WriteBytes(pw::as_bytes(pw::span("\r\n", 2)));
     chars_written += result.size();
 
     return StatusWithSize(result.status(), chars_written);

diff --git a/examples/platform/efr32/PigweedLogger.cpp b/examples/platform/efr32/PigweedLogger.cpp
@@ -52,7 +52,7 @@ static char sWriteBuffer[kWriteBufferSize];
 
 static void send(void)
 {
-    pw::hdlc::WriteUIFrame(kLogHdlcAddress, pw::as_bytes(std::span(sWriteBuffer, sWriteBufferPos)), sWriter);
+    pw::hdlc::WriteUIFrame(kLogHdlcAddress, pw::as_bytes(pw::span(sWriteBuffer, sWriteBufferPos)), sWriter);
     sWriteBufferPos = 0;
 }
 

diff --git a/examples/platform/efr32/pw_sys_io/sys_io_efr32.cc b/examples/platform/efr32/pw_sys_io/sys_io_efr32.cc
@@ -66,13 +66,13 @@ Status WriteByte(std::byte b)
 StatusWithSize WriteLine(const std::string_view & s)
 {
     size_t chars_written  = 0;
-    StatusWithSize result = WriteBytes(pw::as_bytes(std::span(s)));
+    StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
     if (!result.ok())
     {
         return result;
     }
     chars_written += result.size();
-    result = WriteBytes(pw::as_bytes(std::span("\r\n", 2)));
+    result = WriteBytes(pw::as_bytes(pw::span("\r\n", 2)));
     chars_written += result.size();
 
     return StatusWithSize(result.status(), chars_written);

diff --git a/examples/platform/esp32/PigweedLogger.cpp b/examples/platform/esp32/PigweedLogger.cpp
@@ -39,7 +39,7 @@ bool uartInitialised;
 
 void send()
 {
-    pw::hdlc::WriteUIFrame(kLogHdlcAddress, pw::as_bytes(std::span(sWriteBuffer, sWriteBufferPos)), sWriter);
+    pw::hdlc::WriteUIFrame(kLogHdlcAddress, pw::as_bytes(pw::span(sWriteBuffer, sWriteBufferPos)), sWriter);
     sWriteBufferPos = 0;
 }
 

diff --git a/examples/platform/esp32/pw_sys_io/sys_io_esp32.cc b/examples/platform/esp32/pw_sys_io/sys_io_esp32.cc
@@ -95,13 +95,13 @@ Status WriteByte(std::byte b)
 StatusWithSize WriteLine(const std::string_view & s)
 {
     size_t chars_written  = 0;
-    StatusWithSize result = WriteBytes(pw::as_bytes(std::span(s)));
+    StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
     if (!result.ok())
     {
         return result;
     }
     chars_written += result.size();
-    result = WriteBytes(pw::as_bytes(std::span("\r\n", 2)));
+    result = WriteBytes(pw::as_bytes(pw::span("\r\n", 2)));
     chars_written += result.size();
 
     return StatusWithSize(result.status(), chars_written);

diff --git a/examples/platform/mbed/pw_sys_io/sys_io_mbed.cpp b/examples/platform/mbed/pw_sys_io/sys_io_mbed.cpp
@@ -60,15 +60,15 @@ Status WriteByte(std::byte b)
 StatusWithSize WriteLine(const std::string_view & s)
 {
     size_t chars_written  = 0;
-    StatusWithSize result = WriteBytes(pw::as_bytes(std::span(s)));
+    StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
     if (!result.ok())
     {
         return result;
     }
     chars_written += result.size();
 
     // Write trailing newline.
-    result = WriteBytes(pw::as_bytes(std::span("\r\n", 2)));
+    result = WriteBytes(pw::as_bytes(pw::span("\r\n", 2)));
     chars_written += result.size();
 
     return StatusWithSize(result.status(), chars_written);

diff --git a/examples/platform/nrfconnect/pw_sys_io/sys_io_nrfconnect.cc b/examples/platform/nrfconnect/pw_sys_io/sys_io_nrfconnect.cc
@@ -61,15 +61,15 @@ Status WriteByte(std::byte b)
 StatusWithSize WriteLine(const std::string_view & s)
 {
     size_t chars_written  = 0;
-    StatusWithSize result = WriteBytes(pw::as_bytes(std::span(s)));
+    StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
     if (!result.ok())
     {
         return result;
     }
     chars_written += result.size();
 
     // Write trailing newline.
-    result = WriteBytes(pw::as_bytes(std::span("\r\n", 2)));
+    result = WriteBytes(pw::as_bytes(pw::span("\r\n", 2)));
     chars_written += result.size();
 
     return StatusWithSize(result.status(), chars_written);

diff --git a/examples/platform/nrfconnect/util/PigweedLogger.cpp b/examples/platform/nrfconnect/util/PigweedLogger.cpp
@@ -61,7 +61,7 @@ bool sIsPanicMode;
 
 void flush()
 {
-    pw::hdlc::WriteUIFrame(kLogHdlcAddress, pw::as_bytes(std::span(sWriteBuffer, sWriteBufferPos)), sWriter);
+    pw::hdlc::WriteUIFrame(kLogHdlcAddress, pw::as_bytes(pw::span(sWriteBuffer, sWriteBufferPos)), sWriter);
     sWriteBufferPos = 0;
 }
 

diff --git a/examples/platform/qpg/PigweedLogger.cpp b/examples/platform/qpg/PigweedLogger.cpp
@@ -54,7 +54,7 @@ static char sWriteBuffer[kWriteBufferSize];
 
 static void send(void)
 {
-    pw::hdlc::WriteUIFrame(kLogHdlcAddress, pw::as_bytes(std::span(sWriteBuffer, sWriteBufferPos)), sWriter);
+    pw::hdlc::WriteUIFrame(kLogHdlcAddress, pw::as_bytes(pw::span(sWriteBuffer, sWriteBufferPos)), sWriter);
     sWriteBufferPos = 0;
 }
 

diff --git a/examples/platform/qpg/pw_sys_io/sys_io_qpg.cc b/examples/platform/qpg/pw_sys_io/sys_io_qpg.cc
@@ -61,13 +61,13 @@ Status WriteByte(std::byte b)
 StatusWithSize WriteLine(const std::string_view & s)
 {
     size_t chars_written  = 0;
-    StatusWithSize result = WriteBytes(pw::as_bytes(std::span(s)));
+    StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
     if (!result.ok())
     {
         return result;
     }
     chars_written += result.size();
-    result = WriteBytes(pw::as_bytes(std::span("\r\n", 2)));
+    result = WriteBytes(pw::as_bytes(pw::span("\r\n", 2)));
     chars_written += result.size();
 
     return StatusWithSize(result.status(), chars_written);

diff --git a/src/platform/bouffalolab/BL602/KeyValueStoreManagerImpl.cpp b/src/platform/bouffalolab/BL602/KeyValueStoreManagerImpl.cpp
@@ -111,7 +111,7 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Delete(const char * key)
 //                                           size_t offset_bytes) const
 // {
 //     assert(CHIP_KVS_AVAILABLE);
-//     auto status_and_size = mKvs.Get(key, std::span<std::byte>(reinterpret_cast<std::byte *>(value), value_size), offset_bytes);
+//     auto status_and_size = mKvs.Get(key, pw::span<std::byte>(reinterpret_cast<std::byte *>(value), value_size), offset_bytes);
 //     if (read_bytes_size)
 //     {
 //         *read_bytes_size = status_and_size.size();
@@ -139,7 +139,7 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Delete(const char * key)
 // CHIP_ERROR KeyValueStoreManagerImpl::_Put(const char * key, const void * value, size_t value_size)
 // {
 //     assert(CHIP_KVS_AVAILABLE);
-//     auto status = mKvs.Put(key, std::span<const std::byte>(reinterpret_cast<const std::byte *>(value), value_size));
+//     auto status = mKvs.Put(key, pw::span<const std::byte>(reinterpret_cast<const std::byte *>(value), value_size));
 //     switch (status.code())
 //     {
 //     case pw::OkStatus().code():