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
include/icsneo/communication/network.h
+4 -4
View File
@@ -8,7 +8,7 @@ typedef uint8_t neonettype_t;
#ifdef __cplusplus
#include <ostream>
#include "icsneo/platform/optional.h"
#include <optional>
namespace icsneo {
@@ -546,7 +546,7 @@ public:
}
return "Invalid Network";
}
static optional<CoreMini> GetCoreMiniNetworkFromNetID(NetID netid) {
static std::optional<CoreMini> GetCoreMiniNetworkFromNetID(NetID netid) {
switch(netid) {
case NetID::HSCAN:
return CoreMini::HSCAN;
@@ -665,7 +665,7 @@ public:
case NetID::Ethernet2:
return CoreMini::Ethernet2;
default:
return nullopt;
return std::nullopt;
}
}
static NetID GetNetIDFromCoreMiniNetwork(CoreMini cm) {
@@ -796,7 +796,7 @@ public:
Network(CoreMini cm) { setValue(GetNetIDFromCoreMiniNetwork(cm)); }
NetID getNetID() const { return value; }
Type getType() const { return type; }
optional<CoreMini> getCoreMini() const { return GetCoreMiniNetworkFromNetID(getNetID()); }
std::optional<CoreMini> getCoreMini() const { return GetCoreMiniNetworkFromNetID(getNetID()); }
friend std::ostream& operator<<(std::ostream& os, const Network& network) {
os << GetNetIDString(network.getNetID());
return os;