fix: build error

MaaXYZ · Oct 31, 2023 · 302b0a0 · 302b0a0
1 parent 11e4a38
commit 302b0a0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/source/MaaDbgControlUnit/CarouselImage/CarouselImage.h b/source/MaaDbgControlUnit/CarouselImage/CarouselImage.h
@@ -24,10 +24,10 @@ class CarouselImage : public ControllerAPI
     virtual bool stop_app(const std::string& intent) override;
 
     virtual bool click(int x, int y) override;
-    virtual bool swipe(int x1, int y1, int x2, int y2, int duration);
+    virtual bool swipe(int x1, int y1, int x2, int y2, int duration) override;
 
-    virtual bool touch_down(int contact, int x, int y, int pressure);
-    virtual bool touch_move(int contact, int x, int y, int pressure);
+    virtual bool touch_down(int contact, int x, int y, int pressure) override;
+    virtual bool touch_move(int contact, int x, int y, int pressure) override;
     virtual bool touch_up(int contact) override;
 
     virtual bool press_key(int key) override;

diff --git a/source/include/Utils/Logger.h b/source/include/Utils/Logger.h
@@ -117,13 +117,11 @@ class MAA_UTILS_API Logger
                 else if constexpr (std::same_as<std::wstring, std::decay_t<T>>) {
                     return from_u16(std::forward<T>(value));
                 }
-                else if constexpr (has_output_operator<T> && std::same_as<bool, std::decay_t<T>>) {
-                    std::stringstream ss;
-                    ss << std::boolalpha << std::forward<T>(value);
-                    return std::move(ss).str();
-                }
                 else if constexpr (has_output_operator<T>) {
                     std::stringstream ss;
+                    if constexpr (std::same_as<bool, std::decay_t<T>>) {
+                        ss << std::boolalpha;
+                    }
                     ss << std::forward<T>(value);
                     return std::move(ss).str();
                 }

diff --git a/test/source/main.cpp b/test/source/main.cpp
@@ -20,12 +20,12 @@ int main([[maybe_unused]] int argc, char** argv)
     MaaLoggingLevel lv = MaaLoggingLevel_Info;
     MaaSetGlobalOption(MaaGlobalOption_StdoutLevel, &lv, sizeof(lv));
 
-    if (!run_without_file(testset_dir / "PipelineSmoking" / "Screenshot")) {
+    if (!run_without_file(testset_dir)) {
         return -1;
     }
     if (!pipeline_smoking(testset_dir)) {
         return -1;
     }
 
     return 0;
-}
+}