From 7b5dce54af5b40b774b00b96251a1228e7cbe096 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sat, 6 Apr 2019 19:03:23 -1000 Subject: [PATCH] Fix compilation against libc++ --- specter/include/specter/FontCache.hpp | 2 +- specter/include/specter/RootView.hpp | 3 +++ specter/include/specter/ViewResources.hpp | 2 -- specter/zeus | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/specter/include/specter/FontCache.hpp b/specter/include/specter/FontCache.hpp index 5dfe441dc..2584c0776 100644 --- a/specter/include/specter/FontCache.hpp +++ b/specter/include/specter/FontCache.hpp @@ -148,7 +148,7 @@ class FontCache { const hecl::Runtime::FileStoreManager& m_fileMgr; hecl::SystemString m_cacheRoot; struct Library { - FT_Library m_lib; + FT_Library m_lib = nullptr; Library(); ~Library(); operator FT_Library() { return m_lib; } diff --git a/specter/include/specter/RootView.hpp b/specter/include/specter/RootView.hpp index 622151543..266574464 100644 --- a/specter/include/specter/RootView.hpp +++ b/specter/include/specter/RootView.hpp @@ -108,7 +108,10 @@ public: void destroyed(); bool isDestroyed() const { return m_destroyed; } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Woverloaded-virtual" void resized(const boo::SWindowRect& rect, bool) { resized(rect, rect); } +#pragma GCC diagnostic pop void resized(const boo::SWindowRect& rootView, const boo::SWindowRect& sub); void mouseDown(const boo::SWindowCoord& coord, boo::EMouseButton button, boo::EModifierKey mods); void mouseUp(const boo::SWindowCoord& coord, boo::EMouseButton button, boo::EModifierKey mods); diff --git a/specter/include/specter/ViewResources.hpp b/specter/include/specter/ViewResources.hpp index f98180ace..fd6080365 100644 --- a/specter/include/specter/ViewResources.hpp +++ b/specter/include/specter/ViewResources.hpp @@ -177,9 +177,7 @@ public: ViewResources() = default; ViewResources(const ViewResources& other) = delete; - ViewResources(ViewResources&& other) = default; ViewResources& operator=(const ViewResources& other) = delete; - ViewResources& operator=(ViewResources&& other) = default; void updateBuffers() { m_viewRes.updateBuffers(); diff --git a/specter/zeus b/specter/zeus index 617875531..92733a3bb 160000 --- a/specter/zeus +++ b/specter/zeus @@ -1 +1 @@ -Subproject commit 617875531acd375e77f142fdb04fd219162c1237 +Subproject commit 92733a3bb7c62f26bbcc0dfaf89be11636288b7f