Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-21 22:12:58 +02: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/commands/CommandManager.h
View File

@@ -28,6 +28,10 @@
#include "audacity/Types.h"
#ifndef __AUDACITY_OLD_STD__
#include <unordered_map>
#endif
struct MenuBarListEntry
{
MenuBarListEntry(const wxString &name_, wxMenuBar *menubar_)
@@ -88,8 +92,8 @@ using SubMenuList = std::vector < movable_ptr<SubMenuListEntry> >;
// so we don't want the structures to relocate with vector operations.
using CommandList = std::vector<movable_ptr<CommandListEntry>>;
WX_DECLARE_STRING_HASH_MAP_WITH_DECL(CommandListEntry *, CommandNameHash, class AUDACITY_DLL_API);
WX_DECLARE_HASH_MAP_WITH_DECL(int, CommandListEntry *, wxIntegerHash, wxIntegerEqual, CommandIDHash, class AUDACITY_DLL_API);
using CommandNameHash = std::unordered_map<wxString, CommandListEntry*>;
using CommandIDHash = std::unordered_map<int, CommandListEntry*>;
class AudacityProject;