Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/g1/g1HRPrinter.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 | 5f6f2615433a |
children |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2011, 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. |
24 | 24 |
25 #include "precompiled.hpp" | 25 #include "precompiled.hpp" |
26 #include "gc_implementation/g1/g1HRPrinter.hpp" | 26 #include "gc_implementation/g1/g1HRPrinter.hpp" |
27 #include "gc_implementation/g1/heapRegion.hpp" | 27 #include "gc_implementation/g1/heapRegion.hpp" |
28 #include "utilities/ostream.hpp" | 28 #include "utilities/ostream.hpp" |
29 | |
30 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
29 | 31 |
30 const char* G1HRPrinter::action_name(ActionType action) { | 32 const char* G1HRPrinter::action_name(ActionType action) { |
31 switch(action) { | 33 switch(action) { |
32 case Alloc: return "ALLOC"; | 34 case Alloc: return "ALLOC"; |
33 case AllocForce: return "ALLOC-FORCE"; | 35 case AllocForce: return "ALLOC-FORCE"; |