X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48f7ffbe93ab587c54643e2476b0e3b0c74e1386..48ba35c35751f2ba053d091bb9b75f870250c132:/src/common/dynarray.cpp diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp index 3f8fa81887..b098d4854b 100644 --- a/src/common/dynarray.cpp +++ b/src/common/dynarray.cpp @@ -13,10 +13,6 @@ // headers // ============================================================================ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "dynarray.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -414,6 +410,12 @@ void name::insert(iterator it, const_iterator first, const_iterator last) \ _WX_DEFINE_BASEARRAY_COMMON(T, name) \ _WX_DEFINE_BASEARRAY_NOCOMMON(T, name) +#ifdef __INTELC__ + #pragma warning(push) + #pragma warning(disable: 1684) + #pragma warning(disable: 1572) +#endif + _WX_DEFINE_BASEARRAY(const void *, wxBaseArrayPtrVoid) _WX_DEFINE_BASEARRAY(short, wxBaseArrayShort) _WX_DEFINE_BASEARRAY(int, wxBaseArrayInt) @@ -421,6 +423,10 @@ _WX_DEFINE_BASEARRAY(long, wxBaseArrayLong) _WX_DEFINE_BASEARRAY(size_t, wxBaseArraySizeT) _WX_DEFINE_BASEARRAY(double, wxBaseArrayDouble) +#ifdef __INTELC__ + #pragma warning(pop) +#endif + #if wxUSE_STL #include "wx/arrstr.h"