X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/hash.h?ds=sidebyside diff --git a/include/wx/hash.h b/include/wx/hash.h index 3eb539e9d3..452040ba31 100644 --- a/include/wx/hash.h +++ b/include/wx/hash.h @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH() // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,7 +14,7 @@ #include "wx/defs.h" #include "wx/string.h" -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS #include "wx/object.h" #else class WXDLLIMPEXP_FWD_BASE wxObject; @@ -80,7 +79,7 @@ protected: }; class WXDLLIMPEXP_BASE wxHashTableBase -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS : public wxObject #endif { @@ -150,7 +149,7 @@ protected: bool m_deleteContents; private: - DECLARE_NO_COPY_CLASS(wxHashTableBase) + wxDECLARE_NO_COPY_CLASS(wxHashTableBase); }; // ----------------------------------------------------------------------------