From 0fab3a5a1a0729cb417c05d50712bd9083b02801 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 10 May 2004 20:50:28 +0000 Subject: [PATCH] Avoid duplicated definition errors for wxLongToLongHashMap when both grid.h and fs_zip.h are included. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/fs_zip.h | 3 --- include/wx/generic/grid.h | 3 --- include/wx/hashmap.h | 7 +++++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h index e9bbad3fb1..ae111492db 100644 --- a/include/wx/fs_zip.h +++ b/include/wx/fs_zip.h @@ -25,9 +25,6 @@ #include "wx/filesys.h" #include "wx/hashmap.h" -WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual, - wxLongToLongHashMap, class WXDLLIMPEXP_BASE ); - //--------------------------------------------------------------------------- // wxZipFSHandler //--------------------------------------------------------------------------- diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index cfa4ceaad4..0f458be803 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -81,9 +81,6 @@ class WXDLLEXPORT wxComboBox; class WXDLLEXPORT wxTextCtrl; class WXDLLEXPORT wxSpinCtrl; -WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual, - wxLongToLongHashMap, class WXDLLIMPEXP_ADV ); - // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index a418d7be61..ee6c142032 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -655,5 +655,12 @@ public: \ (hashmap).clear(); \ } +//--------------------------------------------------------------------------- +// Declarations of common hashmap classes + +WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual, + wxLongToLongHashMap, class WXDLLIMPEXP_BASE ); + + #endif // _WX_HASHMAP_H_ -- 2.45.2