Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/g1/g1AllocRegion.hpp @ 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 | 55fb97c4c58d |
children | 52b4284cb496 18bf0b66de52 |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2011, 2013, 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. |
182 #endif // G1_ALLOC_REGION_TRACING | 182 #endif // G1_ALLOC_REGION_TRACING |
183 }; | 183 }; |
184 | 184 |
185 class ar_ext_msg : public err_msg { | 185 class ar_ext_msg : public err_msg { |
186 public: | 186 public: |
187 ar_ext_msg(G1AllocRegion* alloc_region, const char *message) : err_msg("") { | 187 ar_ext_msg(G1AllocRegion* alloc_region, const char *message) : err_msg("%s", "") { |
188 alloc_region->fill_in_ext_msg(this, message); | 188 alloc_region->fill_in_ext_msg(this, message); |
189 } | 189 } |
190 }; | 190 }; |
191 | 191 |
192 #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCREGION_HPP | 192 #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCREGION_HPP |