commit 28c00d6eda0d22884edb80a11bffab2d1003df51
author Patrick Williams <patrick@stwcx.xyz> Wed Apr 27 08:37:13 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Wed Apr 27 14:27:50 2022 -0500
tree a0319f2338234dd6816d5927da03fb674774ac64
parent 99d292a383db1806ee4426f5ad2ef9022fc117ab

span: switch to std

Reduce the dependency on stdplus' version of span now that we are using
C++20 and use the one out of the STL instead.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I040ba1796d6f278353fbc990ea6b62314927951e

tools/test/tools_pci_unittest.cpp

diff --git a/tools/test/tools_pci_unittest.cpp b/tools/test/tools_pci_unittest.cpp
index ca6b7ab..c3ce610 100644
--- a/tools/test/tools_pci_unittest.cpp
+++ b/tools/test/tools_pci_unittest.cpp
@@ -23,6 +23,7 @@
 
 #include <algorithm>
 #include <cstdlib>
+#include <span>
 #include <string>
 #include <vector>
 
@@ -350,8 +351,7 @@
     expectSetup(pciMock, dev, &nuvotonDevice, region.data());
 
     std::unique_ptr<PciBridgeIntf> bridge = nuvotonDevice.getBridge(&pciMock);
-    EXPECT_THROW(bridge->write(stdplus::span<std::uint8_t>(data)),
-                 ToolException);
+    EXPECT_THROW(bridge->write(std::span<std::uint8_t>(data)), ToolException);
 }
 
 TEST(NuvotonWriteTest, Success)
@@ -366,10 +366,10 @@
     expectSetup(pciMock, dev, &nuvotonDevice, region.data());
 
     std::unique_ptr<PciBridgeIntf> bridge = nuvotonDevice.getBridge(&pciMock);
-    bridge->write(stdplus::span<std::uint8_t>(data));
+    bridge->write(std::span<std::uint8_t>(data));
 
-    EXPECT_THAT(stdplus::span<uint8_t>(&region[0], data.size()),
-                SpanEq(stdplus::span<uint8_t>(data)));
+    EXPECT_THAT(std::span<uint8_t>(&region[0], data.size()),
+                SpanEq(std::span<uint8_t>(data)));
 }
 
 TEST(NuvotonConfigureTest, Success)
@@ -592,8 +592,7 @@
     expectSetup(pciMock, dev, &aspeedDevice, region.data());
 
     std::unique_ptr<PciBridgeIntf> bridge = aspeedDevice.getBridge(&pciMock);
-    EXPECT_THROW(bridge->write(stdplus::span<std::uint8_t>(data)),
-                 ToolException);
+    EXPECT_THROW(bridge->write(std::span<std::uint8_t>(data)), ToolException);
 }
 
 TEST(AspeedWriteTest, Success)
@@ -608,10 +607,10 @@
     expectSetup(pciMock, dev, &aspeedDevice, region.data());
 
     std::unique_ptr<PciBridgeIntf> bridge = aspeedDevice.getBridge(&pciMock);
-    bridge->write(stdplus::span<std::uint8_t>(data));
+    bridge->write(std::span<std::uint8_t>(data));
 
-    EXPECT_THAT(stdplus::span<uint8_t>(&region[0x10000], data.size()),
-                SpanEq(stdplus::span<uint8_t>(data)));
+    EXPECT_THAT(std::span<uint8_t>(&region[0x10000], data.size()),
+                SpanEq(std::span<uint8_t>(data)));
 }
 
 TEST(AspeedConfigureTest, Success)
@@ -628,7 +627,7 @@
 
     auto configSpan = stdplus::raw::asSpan<uint8_t>(config);
     EXPECT_THAT(
-        stdplus::span<uint8_t>(&region[AspeedDevice::bridge], sizeof(config)),
+        std::span<uint8_t>(&region[AspeedDevice::bridge], sizeof(config)),
         SpanEq(configSpan));
 }