Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/g1/g1AllocRegion.hpp @ 18041:52b4284cb496
Merge with jdk8u20-b26
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 15 Oct 2014 16:02:50 +0200 |
parents | 89152779163c 78bbf4d43a14 |
children | 7848fc12602b |
comparison
equal
deleted
inserted
replaced
17606:45d7b2c7029d | 18041:52b4284cb496 |
---|---|
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. |
191 #endif // G1_ALLOC_REGION_TRACING | 191 #endif // G1_ALLOC_REGION_TRACING |
192 }; | 192 }; |
193 | 193 |
194 class ar_ext_msg : public err_msg { | 194 class ar_ext_msg : public err_msg { |
195 public: | 195 public: |
196 ar_ext_msg(G1AllocRegion* alloc_region, const char *message) : err_msg("") { | 196 ar_ext_msg(G1AllocRegion* alloc_region, const char *message) : err_msg("%s", "") { |
197 alloc_region->fill_in_ext_msg(this, message); | 197 alloc_region->fill_in_ext_msg(this, message); |
198 } | 198 } |
199 }; | 199 }; |
200 | 200 |
201 #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCREGION_HPP | 201 #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1ALLOCREGION_HPP |