Mercurial > hg > graal-jvmci-8
diff src/share/vm/utilities/globalDefinitions_visCPP.hpp @ 14422:2b8e28fdf503
Merge
author | kvn |
---|---|
date | Tue, 05 Nov 2013 17:38:04 -0800 |
parents | 190899198332 |
children | de6a9e811145 |
line wrap: on
line diff
--- a/src/share/vm/utilities/globalDefinitions_visCPP.hpp Wed Oct 16 10:52:41 2013 +0200 +++ b/src/share/vm/utilities/globalDefinitions_visCPP.hpp Tue Nov 05 17:38:04 2013 -0800 @@ -189,6 +189,10 @@ #pragma warning( disable : 4201 ) // nonstandard extension used : nameless struct/union (needed in windows.h) #pragma warning( disable : 4511 ) // copy constructor could not be generated #pragma warning( disable : 4291 ) // no matching operator delete found; memory will not be freed if initialization thows an exception +#ifdef CHECK_UNHANDLED_OOPS +#pragma warning( disable : 4521 ) // class has multiple copy ctors of a single type +#pragma warning( disable : 4522 ) // class has multiple assignment operators of a single type +#endif // CHECK_UNHANDLED_OOPS #if _MSC_VER >= 1400 #pragma warning( disable : 4996 ) // unsafe string functions. Same as define _CRT_SECURE_NO_WARNINGS/_CRT_SECURE_NO_DEPRICATE #endif