Fixed clang 7.3 compile error.

This commit is contained in:
casey langen 2017-03-27 10:30:45 -07:00
parent 52f9375ec4
commit fb12405015
6 changed files with 22 additions and 5 deletions

View File

@ -1,3 +1,9 @@
0.10.2
* fixed clang 7.3 compile error (macOS mavericks should work again)
--------------------------------------------------------------------------------
0.10.1
user-facing:

View File

@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.0)
project(musikbox)
set (musikbox_VERSION_MAJOR 0)
set (musikbox_VERSION_MINOR 10)
set (musikbox_VERSION_PATCH 1)
set (musikbox_VERSION_PATCH 2)
set (musikbox_VERSION "${musikbox_VERSION_MAJOR}.${musikbox_VERSION_MINOR}.${musikbox_VERSION_PATCH}")
include(ExternalProject)

View File

@ -162,7 +162,6 @@ void BrowseLayout::OnVisibilityChanged(bool visible) {
LayoutBase::OnVisibilityChanged(visible);
if (visible) {
Window::MessageQueue().RegisterForBroadcasts(shared_from_this());
this->categoryList->Requery();
}
}

View File

@ -199,11 +199,23 @@ void LibraryLayout::UpdateShortcutsWindow() {
}
void LibraryLayout::OnAddedToParent(IWindow* parent) {
MessageQueue().RegisterForBroadcasts(shared_from_this());
#if (__clang_major__ == 7 && __clang_minor__ == 3)
std::enable_shared_from_this<LayoutBase>* receiver =
(std::enable_shared_from_this<LayoutBase>*) this;
#else
auto receiver = this;
#endif
MessageQueue().RegisterForBroadcasts(receiver->shared_from_this());
}
void LibraryLayout::OnRemovedFromParent(IWindow* parent) {
MessageQueue().UnregisterForBroadcasts(shared_from_this());
#if (__clang_major__ == 7 && __clang_minor__ == 3)
std::enable_shared_from_this<LayoutBase>* receiver =
(std::enable_shared_from_this<LayoutBase>*) this;
#else
auto receiver = this;
#endif
MessageQueue().UnregisterForBroadcasts(receiver->shared_from_this());
}
void LibraryLayout::OnSearchResultSelected(

View File

@ -1,3 +1,3 @@
#pragma once
#define VERSION "0.10.1"
#define VERSION "0.10.2"

Binary file not shown.