mirror of
https://github.com/intrepidcs/libicsneo.git
synced 2026-08-05 01:18:36 +02:00
Optional: nonstd to std
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "icsneo/communication/message/main51message.h"
|
||||
#include "icsneo/communication/command.h"
|
||||
#include "icsneo/platform/optional.h"
|
||||
#include <optional>
|
||||
#include <string>
|
||||
|
||||
namespace icsneo {
|
||||
@@ -29,8 +29,8 @@ public:
|
||||
bool cmTooBig;
|
||||
bool hidUsbState;
|
||||
bool fpgaUsbState;
|
||||
icsneo::optional<uint16_t> busVoltage;
|
||||
icsneo::optional<uint16_t> deviceTemperature;
|
||||
std::optional<uint16_t> busVoltage;
|
||||
std::optional<uint16_t> deviceTemperature;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "icsneo/communication/message/message.h"
|
||||
#include "icsneo/device/deviceversion.h"
|
||||
#include "icsneo/platform/optional.h"
|
||||
#include <optional>
|
||||
|
||||
namespace icsneo {
|
||||
|
||||
@@ -19,7 +19,7 @@ public:
|
||||
VersionMessage(Chip chip) : Message(Message::Type::DeviceVersion), ForChip(chip) {}
|
||||
|
||||
// nullopt here indicates invalid
|
||||
std::vector< optional<DeviceAppVersion> > Versions;
|
||||
std::vector< std::optional<DeviceAppVersion> > Versions;
|
||||
|
||||
// What chips the versions are for
|
||||
const Chip ForChip;
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
|
||||
#include "icsneo/communication/message/message.h"
|
||||
#include "icsneo/communication/command.h"
|
||||
#include "icsneo/platform/optional.h"
|
||||
#include "icsneo/communication/packet/wivicommandpacket.h"
|
||||
#include <optional>
|
||||
#include <string>
|
||||
|
||||
namespace icsneo {
|
||||
@@ -24,9 +24,9 @@ class ResponseMessage : public Message {
|
||||
public:
|
||||
ResponseMessage() : Message(Message::Type::WiVICommandResponse) {}
|
||||
bool success = true;
|
||||
optional<Command> responseTo;
|
||||
optional<int32_t> value;
|
||||
optional<Info> info;
|
||||
std::optional<Command> responseTo;
|
||||
std::optional<int32_t> value;
|
||||
std::optional<Info> info;
|
||||
};
|
||||
|
||||
} // namespace WiVI
|
||||
|
||||
Reference in New Issue
Block a user