Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-10 14:46:24 +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

8
src/AutoRecovery.h
View File

@@ -22,6 +22,10 @@
#include <wx/hashmap.h>
#include <wx/mstream.h>
#ifndef __AUDACITY_OLD_STD__
#include <unordered_map>
#endif
//
// Show auto recovery dialog if there are projects to recover. Should be
// called once at Audacity startup.
@@ -68,8 +72,8 @@ private:
// Should be plain ASCII
#define AutoSaveIdent "<?xml autosave>"
WX_DECLARE_STRING_HASH_MAP_WITH_DECL(short, NameMap, class AUDACITY_DLL_API);
WX_DECLARE_HASH_MAP_WITH_DECL(short, wxString, wxIntegerHash, wxIntegerEqual, IdMap, class AUDACITY_DLL_API);
using NameMap = std::unordered_map<wxString, short>;
using IdMap = std::unordered_map<short, wxString>;
WX_DECLARE_OBJARRAY_WITH_DECL(IdMap, IdMapArray, class AUDACITY_DLL_API);
// This class's overrides do NOT throw AudacityException.