diff options
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | include/cru/common/Format.h | 5 | ||||
| -rw-r--r-- | include/cru/ui/controls/LayoutControl.h | 2 | ||||
| -rw-r--r-- | include/cru/ui/controls/SingleChildControl.h | 2 | ||||
| -rw-r--r-- | include/cru/ui/render/LayoutRenderObject.h | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | tools/migrate-2/rename-hpp-to-h.py | 0 |
7 files changed, 8 insertions, 10 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 676531a7..50c54149 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,7 +61,9 @@ jobs: - name: Build run: | - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -S. -Bbuild -G Ninja + . tools/Use-VC.ps1 + Use-VC + cmake -DCMAKE_BUILD_TYPE=Debug -S. -Bbuild -G Ninja cmake --build build --config Debug --target all - name: Test diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d07ecdd..63ae5d13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,7 @@ project(cru) enable_testing() if (MSVC) - string(REGEX REPLACE "/W[0-4]\\s*" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - add_compile_options(/utf-8 /W4 /WX) + add_compile_options(/utf-8) endif() set(CRU_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include) diff --git a/include/cru/common/Format.h b/include/cru/common/Format.h index ede2998b..7628f07d 100644 --- a/include/cru/common/Format.h +++ b/include/cru/common/Format.h @@ -35,10 +35,7 @@ std::enable_if_t<std::is_floating_point_v<T>, String> ToString(T value) { } template <typename T> -std::enable_if_t< - std::is_convertible_v<decltype(ToString(std::declval<const T&>)), String>, - String> -ToString(const T& value, StringView option) { +String ToString(const T& value, StringView option) { CRU_UNUSED(option) return ToString(value); } diff --git a/include/cru/ui/controls/LayoutControl.h b/include/cru/ui/controls/LayoutControl.h index 59ffaee2..2ea6ef67 100644 --- a/include/cru/ui/controls/LayoutControl.h +++ b/include/cru/ui/controls/LayoutControl.h @@ -3,7 +3,7 @@ namespace cru::ui::controls { template <typename TRenderObject> -class CRU_UI_API LayoutControl : public Control { +class LayoutControl : public Control { protected: LayoutControl() : container_render_object_(new TRenderObject()) { container_render_object_->SetAttachedControl(this); diff --git a/include/cru/ui/controls/SingleChildControl.h b/include/cru/ui/controls/SingleChildControl.h index d40d7a27..6bf150c0 100644 --- a/include/cru/ui/controls/SingleChildControl.h +++ b/include/cru/ui/controls/SingleChildControl.h @@ -3,7 +3,7 @@ namespace cru::ui::controls { template <typename TRenderObject> -class CRU_UI_API SingleChildControl : public Control { +class SingleChildControl : public Control { protected: SingleChildControl() : container_render_object_(new TRenderObject()) { container_render_object_->SetAttachedControl(this); diff --git a/include/cru/ui/render/LayoutRenderObject.h b/include/cru/ui/render/LayoutRenderObject.h index c8678deb..8fec3ada 100644 --- a/include/cru/ui/render/LayoutRenderObject.h +++ b/include/cru/ui/render/LayoutRenderObject.h @@ -5,7 +5,7 @@ namespace cru::ui::render { template <typename TChildLayoutData> -class CRU_UI_API LayoutRenderObject : public RenderObject { +class LayoutRenderObject : public RenderObject { public: using ChildLayoutData = TChildLayoutData; diff --git a/tools/migrate-2/rename-hpp-to-h.py b/tools/migrate-2/rename-hpp-to-h.py index c72fb2e0..c72fb2e0 100755..100644 --- a/tools/migrate-2/rename-hpp-to-h.py +++ b/tools/migrate-2/rename-hpp-to-h.py |