aboutsummaryrefslogtreecommitdiff
path: root/include/cru/base
diff options
context:
space:
mode:
authorYuqian Yang <crupest@crupest.life>2025-11-03 20:48:22 +0800
committerYuqian Yang <crupest@crupest.life>2025-11-03 20:48:22 +0800
commit40bbf3c14a782673bbd36c8a98adb0934b06add5 (patch)
tree4878604ccba77a957cbacd42dd1355fe33f5d0af /include/cru/base
parenta04627baa74b2b6660addeb9853225852634cf34 (diff)
downloadcru-40bbf3c14a782673bbd36c8a98adb0934b06add5.tar.gz
cru-40bbf3c14a782673bbd36c8a98adb0934b06add5.tar.bz2
cru-40bbf3c14a782673bbd36c8a98adb0934b06add5.zip
Osx remove Resource.h.
Diffstat (limited to 'include/cru/base')
-rw-r--r--include/cru/base/SubProcess.h8
-rw-r--r--include/cru/base/platform/osx/Base.h (renamed from include/cru/base/Osx.h)2
2 files changed, 4 insertions, 6 deletions
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<std::mutex> 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<std::chrono::milliseconds> wait_time = std::nullopt);
diff --git a/include/cru/base/Osx.h b/include/cru/base/platform/osx/Base.h
index e42a4fe5..290d9b3d 100644
--- a/include/cru/base/Osx.h
+++ b/include/cru/base/platform/osx/Base.h
@@ -6,7 +6,7 @@
#error "This header can only be included on OSX platforms."
#endif
-#include "Range.h"
+#include "../../Range.h"
#include <CoreFoundation/CoreFoundation.h>
#include <string>