sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

Optional: nonstd to std

Browse Source
This commit is contained in:
Kyle Schwarz
2022-07-22 01:27:39 -04:00
parent 1bb33156f7
commit 9ef01e2d3d
77 changed files with 175 additions and 7628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/diskdrivertest.h
+10 -10
View File
@@ -3,10 +3,10 @@
#include "icsneo/disk/diskreaddriver.h"
#include "icsneo/disk/diskwritedriver.h"
#include "icsneo/platform/optional.h"
#include "gtest/gtest.h"
#include <queue>
#include <functional>
#include <optional>
using namespace icsneo;
@@ -17,7 +17,7 @@ class MockDiskDriver : public Disk::ReadDriver, public Disk::WriteDriver {
public:
std::pair<uint32_t, uint32_t> getBlockSizeBounds() const override { return { 8, 256 }; }
optional<uint64_t> readLogicalDiskAligned(Communication&, device_eventhandler_t,
std::optional<uint64_t> readLogicalDiskAligned(Communication&, device_eventhandler_t,
uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds) override {
readCalls++;
@@ -26,9 +26,9 @@ public:
EXPECT_EQ(amount % getBlockSizeBounds().first, 0);
if(pos > mockDisk.size()) // EOF
return nullopt;
return std::nullopt;
optional<uint64_t> readAmount = std::min(amount, mockDisk.size() - pos);
std::optional<uint64_t> readAmount = std::min(amount, mockDisk.size() - pos);
if(readAmount > 0u)
memcpy(into, mockDisk.data() + pos, static_cast<size_t>(*readAmount));
@@ -39,7 +39,7 @@ public:
return readAmount;
}
optional<uint64_t> writeLogicalDiskAligned(Communication&, device_eventhandler_t report, uint64_t pos,
std::optional<uint64_t> writeLogicalDiskAligned(Communication&, device_eventhandler_t report, uint64_t pos,
const uint8_t* atomicBuf, const uint8_t* from, uint64_t amount, std::chrono::milliseconds) override {
writeCalls++;
@@ -48,9 +48,9 @@ public:
EXPECT_EQ(amount % getBlockSizeBounds().first, 0);
if(pos > mockDisk.size()) // EOF
return nullopt;
return std::nullopt;
optional<uint64_t> writeAmount = std::min(amount, mockDisk.size() - pos);
std::optional<uint64_t> writeAmount = std::min(amount, mockDisk.size() - pos);
if(writeAmount > 0u) {
if(atomicBuf) {
if(supportsAtomic) {
@@ -107,15 +107,15 @@ protected:
driver.reset();
}
optional<uint64_t> readLogicalDisk(uint64_t pos, uint8_t* into, uint64_t amount) {
std::optional<uint64_t> readLogicalDisk(uint64_t pos, uint8_t* into, uint64_t amount) {
return driver->readLogicalDisk(*com, onError, pos, into, amount /* default timeout */);
}
optional<uint64_t> writeLogicalDisk(uint64_t pos, const uint8_t* from, uint64_t amount) {
std::optional<uint64_t> writeLogicalDisk(uint64_t pos, const uint8_t* from, uint64_t amount) {
return driver->writeLogicalDisk(*com, onError, *driver, pos, from, amount /* default timeout */);
}
optional<MockDiskDriver> driver;
std::optional<MockDiskDriver> driver;
std::queue< std::pair<APIEvent::Type, APIEvent::Severity> > expectedErrors;
device_eventhandler_t onError;
test/ethernetpacketizertest.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
#include "icsneo/communication/ethernetpacketizer.h"
#include "icsneo/platform/optional.h"
#include "gtest/gtest.h"
#include <optional>
using namespace icsneo;
@@ -27,7 +27,7 @@ protected:
packetizer.reset();
}
optional<EthernetPacketizer> packetizer;
std::optional<EthernetPacketizer> packetizer;
device_eventhandler_t onError;
};