AuroraSupport/AuroraRuntime
2
1
Fork 0
Code Issues 27 Pull Requests Releases Wiki Activity

[*] Revert AuOptionalEx -> AuOptional change

Browse Source
This commit is contained in:
Reece Wilson 2023-12-18 08:52:51 +00:00
parent 414c736179
commit 4dc2f94467
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Include/Aurora/IO/IOHandle.hpp
View File

@ -103,25 +103,25 @@ namespace Aurora::IO
virtual bool InitFromMove(AuUInt64 uOSHandle) = 0; virtual bool InitFromMove(AuUInt64 uOSHandle) = 0;
virtual bool InitFromPair(AuOptional<AuUInt64> uOSReadHandle, virtual bool InitFromPair(AuOptionalEx<AuUInt64> optOSReadHandle,
AuOptional<AuUInt64> uOSWriteHandle) = 0; AuOptionalEx<AuUInt64> optOSWriteHandle) = 0;
virtual bool InitFromPairMove(AuOptional<AuUInt64> uOSReadHandle, virtual bool InitFromPairMove(AuOptionalEx<AuUInt64> optOSReadHandle,
AuOptional<AuUInt64> uOSWriteHandle) = 0; AuOptionalEx<AuUInt64> optOSWriteHandle) = 0;
virtual bool InitFromStreamEnum(EStandardStream eStream) = 0; virtual bool InitFromStreamEnum(EStandardStream eStream) = 0;
virtual AuUInt64 GetOSHandle() const = 0; virtual AuUInt64 GetOSHandle() const = 0;
virtual AuOptional<AuUInt64> GetOSHandleSafe() const = 0; virtual AuOptionalEx<AuUInt64> GetOSHandleSafe() const = 0;
virtual AuUInt64 GetOSReadHandle() const = 0; virtual AuUInt64 GetOSReadHandle() const = 0;
virtual AuOptional<AuUInt64> GetOSReadHandleSafe() const = 0; virtual AuOptionalEx<AuUInt64> GetOSReadHandleSafe() const = 0;
virtual AuUInt64 GetOSWriteHandle() const = 0; virtual AuUInt64 GetOSWriteHandle() const = 0;
virtual AuOptional<AuUInt64> GetOSWriteHandleSafe() const = 0; virtual AuOptionalEx<AuUInt64> GetOSWriteHandleSafe() const = 0;
virtual bool IsValid() const = 0; virtual bool IsValid() const = 0;

16
Source/IO/AuIOHandle.cpp
View File

@ -82,8 +82,8 @@ namespace Aurora::IO
return true; return true;
} }
bool AFileHandle::InitFromPair(AuOptional<AuUInt64> optOSReadHandle, bool AFileHandle::InitFromPair(AuOptionalEx<AuUInt64> optOSReadHandle,
AuOptional<AuUInt64> optOSWriteHandle) AuOptionalEx<AuUInt64> optOSWriteHandle)
{ {
if (this->IsValid()) if (this->IsValid())
{ {
@ -119,8 +119,8 @@ namespace Aurora::IO
return true; return true;
} }
bool AFileHandle::InitFromPairMove(AuOptional<AuUInt64> uOSReadHandle, bool AFileHandle::InitFromPairMove(AuOptionalEx<AuUInt64> uOSReadHandle,
AuOptional<AuUInt64> uOSWriteHandle) AuOptionalEx<AuUInt64> uOSWriteHandle)
{ {
if (this->IsValid()) if (this->IsValid())
{ {
@ -219,7 +219,7 @@ namespace Aurora::IO
return bIsPipe; return bIsPipe;
} }
AuOptional<AuUInt64> AFileHandle::GetOSHandleSafe() const AuOptionalEx<AuUInt64> AFileHandle::GetOSHandleSafe() const
{ {
if (auto write = this->uOSWriteHandle) if (auto write = this->uOSWriteHandle)
{ {
@ -236,7 +236,7 @@ namespace Aurora::IO
AuUInt64 AFileHandle::GetOSHandle() const AuUInt64 AFileHandle::GetOSHandle() const
{ {
return this->uOSReadHandle.value_or(this->uOSWriteHandle.value()); return this->uOSReadHandle.ValueOr(this->uOSWriteHandle.value());
} }
AuUInt64 AFileHandle::GetOSReadHandle() const AuUInt64 AFileHandle::GetOSReadHandle() const
@ -244,7 +244,7 @@ namespace Aurora::IO
return this->uOSReadHandle.value(); return this->uOSReadHandle.value();
} }
AuOptional<AuUInt64> AFileHandle::GetOSReadHandleSafe() const AuOptionalEx<AuUInt64> AFileHandle::GetOSReadHandleSafe() const
{ {
return this->uOSReadHandle; return this->uOSReadHandle;
} }
@ -254,7 +254,7 @@ namespace Aurora::IO
return this->uOSWriteHandle.value(); return this->uOSWriteHandle.value();
} }
AuOptional<AuUInt64> AFileHandle::GetOSWriteHandleSafe() const AuOptionalEx<AuUInt64> AFileHandle::GetOSWriteHandleSafe() const
{ {
return this->uOSWriteHandle; return this->uOSWriteHandle;
} }

18
Source/IO/AuIOHandle.hpp
View File

@ -24,11 +24,11 @@ namespace Aurora::IO
bool InitFromMove(AuUInt64 uOSHandle) override; bool InitFromMove(AuUInt64 uOSHandle) override;
bool InitFromPair(AuOptional<AuUInt64> uOSReadHandle, bool InitFromPair(AuOptionalEx<AuUInt64> uOSReadHandle,
AuOptional<AuUInt64> uOSWriteHandle) override; AuOptionalEx<AuUInt64> uOSWriteHandle) override;
bool InitFromPairMove(AuOptional<AuUInt64> uOSReadHandle, bool InitFromPairMove(AuOptionalEx<AuUInt64> uOSReadHandle,
AuOptional<AuUInt64> uOSWriteHandle) override; AuOptionalEx<AuUInt64> uOSWriteHandle) override;
bool InitFromStreamEnum(EStandardStream eStream) override; bool InitFromStreamEnum(EStandardStream eStream) override;
@ -36,15 +36,15 @@ namespace Aurora::IO
AuUInt64 GetOSHandle() const override; AuUInt64 GetOSHandle() const override;
AuOptional<AuUInt64> GetOSHandleSafe() const override; AuOptionalEx<AuUInt64> GetOSHandleSafe() const override;
AuUInt64 GetOSReadHandle() const override; AuUInt64 GetOSReadHandle() const override;
AuOptional<AuUInt64> GetOSReadHandleSafe() const override; AuOptionalEx<AuUInt64> GetOSReadHandleSafe() const override;
AuUInt64 GetOSWriteHandle() const override; AuUInt64 GetOSWriteHandle() const override;
AuOptional<AuUInt64> GetOSWriteHandleSafe() const override; AuOptionalEx<AuUInt64> GetOSWriteHandleSafe() const override;
bool IsValid() const override; bool IsValid() const override;
@ -68,8 +68,8 @@ namespace Aurora::IO
bool SectionUnlock(AuUInt64 uOffset, bool SectionUnlock(AuUInt64 uOffset,
AuUInt64 uLength) override; AuUInt64 uLength) override;
AuOptional<AuUInt64> uOSWriteHandle; AuOptionalEx<AuUInt64> uOSWriteHandle;
AuOptional<AuUInt64> uOSReadHandle; AuOptionalEx<AuUInt64> uOSReadHandle;
AuSPtr<IIOHandle> pThat; AuSPtr<IIOHandle> pThat;
bool bIsAsync {}; bool bIsAsync {};
AuString path; AuString path;