Commit b32f4975 authored by Jack Andersen's avatar Jack Andersen

Fix compilation against libc++

parent ecea5833
......@@ -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; }
......
......@@ -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);
......
......@@ -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();
......
Subproject commit 617875531acd375e77f142fdb04fd219162c1237
Subproject commit 92733a3bb7c62f26bbcc0dfaf89be11636288b7f
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment