From 068714c0f2fe7ab003462e5483f9944b0bf2f8e0 Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 18 Mar 2020 21:40:10 +0800 Subject: ... --- .gitignore | 1 + CMakeLists.txt | 2 +- include/cru/platform/graph/base.hpp | 12 ++++++++++-- include/cru/platform/graph/fwd.hpp | 12 ------------ 4 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 include/cru/platform/graph/fwd.hpp diff --git a/.gitignore b/.gitignore index 058ed33c..122fa5e4 100644 --- a/.gitignore +++ b/.gitignore @@ -590,3 +590,4 @@ flycheck_*.el # End of https://www.gitignore.io/api/emacs compile_flags.txt +.clangd diff --git a/CMakeLists.txt b/CMakeLists.txt index 62709ec5..34adff17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(CruUI) enable_testing() -set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_STANDARD 17) if (MSVC) string(REGEX REPLACE "/W[0-4]\\s*" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) diff --git a/include/cru/platform/graph/base.hpp b/include/cru/platform/graph/base.hpp index 0b011262..002c2f51 100644 --- a/include/cru/platform/graph/base.hpp +++ b/include/cru/platform/graph/base.hpp @@ -3,11 +3,19 @@ #include "../matrix.hpp" #include "../resource.hpp" -#include "fwd.hpp" - #include namespace cru::platform::graph { +// forward declarations +struct IGraphFactory; +struct IBrush; +struct ISolidColorBrush; +struct IFont; +struct IGeometry; +struct IGeometryBuilder; +struct IPainter; +struct ITextLayout; + struct TextHitTestResult { int position; bool trailing; diff --git a/include/cru/platform/graph/fwd.hpp b/include/cru/platform/graph/fwd.hpp deleted file mode 100644 index 508a49fa..00000000 --- a/include/cru/platform/graph/fwd.hpp +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -namespace cru::platform::graph { -struct IGraphFactory; -struct IBrush; -struct ISolidColorBrush; -struct IFont; -struct IGeometry; -struct IGeometryBuilder; -struct IPainter; -struct ITextLayout; -} // namespace cru::platform::graph -- cgit v1.2.3