6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-08 14:25:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1314 from ryandesign/nullptr_t

Browse Source
This commit is contained in:
Thomas Harte
2024-01-21 19:02:42 -05:00
committed by GitHub
parent 981f8a9aac 070efd99e0
commit 9361f29479
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Analyser/Static/StaticAnalyser.cpp
View File

@@ -9,6 +9,7 @@
#include "StaticAnalyser.hpp" #include "StaticAnalyser.hpp"
#include <algorithm> #include <algorithm>
#include <cstddef>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <iterator> #include <iterator>
@@ -179,7 +180,7 @@ static Media GetMediaAndPlatforms(const std::string &file_name, TargetPlatform::
std::visit([&](auto &&arg) { std::visit([&](auto &&arg) {
using Type = typename std::decay<decltype(arg)>::type; using Type = typename std::decay<decltype(arg)>::type;
if constexpr (std::is_same<Type, nullptr_t>::value) { if constexpr (std::is_same<Type, std::nullptr_t>::value) {
// It's valid for no media to be returned. // It's valid for no media to be returned.
} else if constexpr (std::is_same<Type, Disk::DiskImageHolderBase *>::value) { } else if constexpr (std::is_same<Type, Disk::DiskImageHolderBase *>::value) {
accumulator.insert(TargetPlatform::DiskII, std::shared_ptr<Disk::DiskImageHolderBase>(arg)); accumulator.insert(TargetPlatform::DiskII, std::shared_ptr<Disk::DiskImageHolderBase>(arg));

3
Storage/Disk/DiskImage/Formats/2MG.hpp
View File

@@ -13,6 +13,7 @@
#include "../../../FileHolder.hpp" #include "../../../FileHolder.hpp"
#include <cstddef>
#include <variant> #include <variant>
namespace Storage::Disk { namespace Storage::Disk {
@@ -28,7 +29,7 @@ namespace Storage::Disk {
class Disk2MG { class Disk2MG {
public: public:
using DiskOrMassStorageDevice = std::variant<nullptr_t, DiskImageHolderBase *, Storage::MassStorage::MassStorageDevice *>; using DiskOrMassStorageDevice = std::variant<std::nullptr_t, DiskImageHolderBase *, Storage::MassStorage::MassStorageDevice *>;
static DiskOrMassStorageDevice open(const std::string &file_name); static DiskOrMassStorageDevice open(const std::string &file_name);
}; };