< prev index next >

src/share/vm/utilities/growableArray.hpp

Print this page
rev 9696 : 8145740: Visual Studio pragmas should be guarded by ifdef _MSC_VER

*** 167,177 **** --- 167,179 ---- GrowableArray(int initial_size, bool C_heap = false, MEMFLAGS F = mtInternal) : GenericGrowableArray(initial_size, 0, C_heap, F) { _data = (E*)raw_allocate(sizeof(E)); // Needed for Visual Studio 2012 and older + #ifdef _MSC_VER #pragma warning(suppress: 4345) + #endif for (int i = 0; i < _max; i++) ::new ((void*)&_data[i]) E(); } GrowableArray(int initial_size, int initial_len, const E& filler, bool C_heap = false, MEMFLAGS memflags = mtInternal) : GenericGrowableArray(initial_size, initial_len, C_heap, memflags) {
*** 420,430 **** --- 422,434 ---- // j < _max E* newData = (E*)raw_allocate(sizeof(E)); int i = 0; for ( ; i < _len; i++) ::new ((void*)&newData[i]) E(_data[i]); // Needed for Visual Studio 2012 and older + #ifdef _MSC_VER #pragma warning(suppress: 4345) + #endif for ( ; i < _max; i++) ::new ((void*)&newData[i]) E(); for (i = 0; i < old_max; i++) _data[i].~E(); if (on_C_heap() && _data != NULL) { FreeHeap(_data); }
< prev index next >