Mercurial > hg > truffle
comparison src/share/vm/utilities/globalDefinitions_visCPP.hpp @ 12873:4e7f99b70d9d
Merge
author | adlertz |
---|---|
date | Wed, 09 Oct 2013 05:03:34 -0700 |
parents | 190899198332 |
children | de6a9e811145 |
comparison
equal
deleted
inserted
replaced
12872:98692a2d36d7 | 12873:4e7f99b70d9d |
---|---|
187 #pragma warning( disable : 4244 ) // possible loss of data | 187 #pragma warning( disable : 4244 ) // possible loss of data |
188 #pragma warning( disable : 4512 ) // assignment operator could not be generated | 188 #pragma warning( disable : 4512 ) // assignment operator could not be generated |
189 #pragma warning( disable : 4201 ) // nonstandard extension used : nameless struct/union (needed in windows.h) | 189 #pragma warning( disable : 4201 ) // nonstandard extension used : nameless struct/union (needed in windows.h) |
190 #pragma warning( disable : 4511 ) // copy constructor could not be generated | 190 #pragma warning( disable : 4511 ) // copy constructor could not be generated |
191 #pragma warning( disable : 4291 ) // no matching operator delete found; memory will not be freed if initialization thows an exception | 191 #pragma warning( disable : 4291 ) // no matching operator delete found; memory will not be freed if initialization thows an exception |
192 #ifdef CHECK_UNHANDLED_OOPS | |
193 #pragma warning( disable : 4521 ) // class has multiple copy ctors of a single type | |
194 #pragma warning( disable : 4522 ) // class has multiple assignment operators of a single type | |
195 #endif // CHECK_UNHANDLED_OOPS | |
192 #if _MSC_VER >= 1400 | 196 #if _MSC_VER >= 1400 |
193 #pragma warning( disable : 4996 ) // unsafe string functions. Same as define _CRT_SECURE_NO_WARNINGS/_CRT_SECURE_NO_DEPRICATE | 197 #pragma warning( disable : 4996 ) // unsafe string functions. Same as define _CRT_SECURE_NO_WARNINGS/_CRT_SECURE_NO_DEPRICATE |
194 #endif | 198 #endif |
195 | 199 |
196 inline int vsnprintf(char* buf, size_t count, const char* fmt, va_list argptr) { | 200 inline int vsnprintf(char* buf, size_t count, const char* fmt, va_list argptr) { |