1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-04 17:49:45 +02:00

Fix Windows build

This commit is contained in:
Paul Licameli 2016-08-14 09:32:46 -04:00
parent 32f24eabb2
commit 41efaeeef0
3 changed files with 7 additions and 3 deletions

View File

@ -11,7 +11,7 @@
#ifndef _DIRMANAGER_
#define _DIRMANAGER_
#include <MemoryX.h>
#include "MemoryX.h"
#include <wx/list.h>
#include <wx/string.h>
#include <wx/filename.h>

View File

@ -733,7 +733,7 @@ Final_action<F> finally (F f)
template <typename Iterator>
struct IteratorRange : public std::pair<Iterator, Iterator> {
IteratorRange (Iterator &&a, Iterator &&b)
: std::pair<Iterator, Iterator> { std::move(a), std::move(b) } {}
: std::pair<Iterator, Iterator> ( std::move(a), std::move(b) ) {}
Iterator begin() const { return this->first; }
Iterator end() const { return this->second; }

View File

@ -44,7 +44,11 @@ struct SubMenuListEntry
: name(name_), menu( std::move(menu_) )
{}
// SubMenuListEntry( SubMenuListEntry&& ) = default;
SubMenuListEntry(SubMenuListEntry &&that)
: name(std::move(that.name))
, menu(std::move(that.menu))
{
}
wxString name;
std::unique_ptr<wxMenu> menu;