Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/parNew/parNewGeneration.cpp @ 17937:78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
8043029: Change 8037816 breaks HS build with older GCC versions which don't support diagnostic pragmas
8043164: Format warning in traceStream.hpp
Summary: Backport of main fix + two corrections, enables clang compilation, turns on format attributes, corrects/mutes warnings
Reviewed-by: kvn, coleenp, iveresov, twisti
author | drchase |
---|---|
date | Thu, 22 May 2014 15:52:41 -0400 |
parents | 86e6d691f2e1 |
children | 8e20ef014b08 |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
52 #include "runtime/java.hpp" | 52 #include "runtime/java.hpp" |
53 #include "runtime/thread.hpp" | 53 #include "runtime/thread.hpp" |
54 #include "utilities/copy.hpp" | 54 #include "utilities/copy.hpp" |
55 #include "utilities/globalDefinitions.hpp" | 55 #include "utilities/globalDefinitions.hpp" |
56 #include "utilities/workgroup.hpp" | 56 #include "utilities/workgroup.hpp" |
57 | |
58 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
57 | 59 |
58 #ifdef _MSC_VER | 60 #ifdef _MSC_VER |
59 #pragma warning( push ) | 61 #pragma warning( push ) |
60 #pragma warning( disable:4355 ) // 'this' : used in base member initializer list | 62 #pragma warning( disable:4355 ) // 'this' : used in base member initializer list |
61 #endif | 63 #endif |