Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-15 09:01:12 +01:00
Code Issues Releases Wiki Activity

Use std::[tr1::]unordered_(set|map), not the wxWidgets container macros

Browse Source
This commit is contained in:
Paul Licameli
2018-01-08 16:38:52 -05:00
parent cd8ec5e6a8
commit cb403954fa
16 changed files with 103 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Dependencies.cpp
View File

@@ -56,15 +56,16 @@ AliasedFile s.
#include "WaveClip.h"
#include "widgets/ErrorDialog.h"
WX_DECLARE_HASH_MAP(wxString, AliasedFile *,
wxStringHash, wxStringEqual, AliasedFileHash);
#ifndef __AUDACITY_OLD_STD__
#include <unordered_map>
#endif
using AliasedFileHash = std::unordered_map<wxString, AliasedFile*>;
// These two hash types are used only inside short scopes
// so it is safe to key them by plain pointers.
WX_DECLARE_HASH_MAP(BlockFile *, BlockFilePtr,
wxPointerHash, wxPointerEqual, ReplacedBlockFileHash);
WX_DECLARE_HASH_MAP(BlockFile *, bool,
wxPointerHash, wxPointerEqual, BoolBlockFileHash);
using ReplacedBlockFileHash = std::unordered_map<BlockFile *, BlockFilePtr>;
using BoolBlockFileHash = std::unordered_map<BlockFile *, bool>;
// Given a project, returns a single array of all SeqBlocks
// in the current set of tracks. Enumerating that array allows