Merge
authordholmes
Wed, 27 Jan 2016 05:59:31 +0100
changeset 35850 34c2f89c8ebb
parent 35848 72ff6dab9572 (current diff)
parent 35849 f095845829c9 (diff)
child 35851 5451ff646f8e
child 35852 15ca44d4ae0c
child 35854 d6e6f0a781e4
Merge
--- a/hotspot/src/share/vm/utilities/growableArray.hpp	Wed Jan 27 03:28:22 2016 +0000
+++ b/hotspot/src/share/vm/utilities/growableArray.hpp	Wed Jan 27 05:59:31 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -169,7 +169,9 @@
     : 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();
   }
 
@@ -422,7 +424,9 @@
     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) {