From 40bbf3c14a782673bbd36c8a98adb0934b06add5 Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Mon, 3 Nov 2025 20:48:22 +0800 Subject: Osx remove Resource.h. --- include/cru/base/Osx.h | 38 ------------------------------------ include/cru/base/SubProcess.h | 8 +++----- include/cru/base/platform/osx/Base.h | 38 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 43 deletions(-) delete mode 100644 include/cru/base/Osx.h create mode 100644 include/cru/base/platform/osx/Base.h (limited to 'include/cru/base') diff --git a/include/cru/base/Osx.h b/include/cru/base/Osx.h deleted file mode 100644 index e42a4fe5..00000000 --- a/include/cru/base/Osx.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once - -// TODO: Move This file to platform dir. - -#ifndef __APPLE__ -#error "This header can only be included on OSX platforms." -#endif - -#include "Range.h" - -#include -#include -#include - -namespace cru { -template -class CFWrapper { - public: - CFClassRef ref; - - explicit CFWrapper(CFClassRef ref) { this->ref = ref; } - ~CFWrapper() { - if (this->ref) CFRelease(this->ref); - } - - CFClassRef* release() { - auto ref = this->ref; - this->ref = nullptr; - return ref; - } -}; - -CFWrapper ToCFString(std::string_view string); -std::string FromCFStringRef(CFStringRef string); - -CFRange ToCFRange(const Range& range); -Range FromCFRange(const CFRange& range); -} // namespace cru diff --git a/include/cru/base/SubProcess.h b/include/cru/base/SubProcess.h index 1562769e..e8ba5936 100644 --- a/include/cru/base/SubProcess.h +++ b/include/cru/base/SubProcess.h @@ -210,7 +210,7 @@ class PlatformSubProcess : public Object { std::unique_lock lock_; }; -class CRU_BASE_API SubProcess : public Object { +class CRU_BASE_API SubProcess { CRU_DEFINE_CLASS_LOG_TAG("SubProcess") public: @@ -226,11 +226,9 @@ class CRU_BASE_API SubProcess : public Object { SubProcess(SubProcessStartInfo start_info); CRU_DELETE_COPY(SubProcess) + CRU_DEFAULT_MOVE(SubProcess) - SubProcess(SubProcess&& other) = default; - SubProcess& operator=(SubProcess&& other) = default; - - ~SubProcess() override; + ~SubProcess(); public: void Wait(std::optional wait_time = std::nullopt); diff --git a/include/cru/base/platform/osx/Base.h b/include/cru/base/platform/osx/Base.h new file mode 100644 index 00000000..290d9b3d --- /dev/null +++ b/include/cru/base/platform/osx/Base.h @@ -0,0 +1,38 @@ +#pragma once + +// TODO: Move This file to platform dir. + +#ifndef __APPLE__ +#error "This header can only be included on OSX platforms." +#endif + +#include "../../Range.h" + +#include +#include +#include + +namespace cru { +template +class CFWrapper { + public: + CFClassRef ref; + + explicit CFWrapper(CFClassRef ref) { this->ref = ref; } + ~CFWrapper() { + if (this->ref) CFRelease(this->ref); + } + + CFClassRef* release() { + auto ref = this->ref; + this->ref = nullptr; + return ref; + } +}; + +CFWrapper ToCFString(std::string_view string); +std::string FromCFStringRef(CFStringRef string); + +CFRange ToCFRange(const Range& range); +Range FromCFRange(const CFRange& range); +} // namespace cru -- cgit v1.2.3