Mercurial > hg > truffle
comparison src/share/vm/oops/annotations.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 | a1ebd310d5c1 |
children |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2012, 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. |
74 } | 74 } |
75 } | 75 } |
76 | 76 |
77 | 77 |
78 void Annotations::print_value_on(outputStream* st) const { | 78 void Annotations::print_value_on(outputStream* st) const { |
79 st->print("Anotations(" INTPTR_FORMAT ")", this); | 79 st->print("Anotations(" INTPTR_FORMAT ")", p2i(this)); |
80 } | 80 } |
81 | 81 |
82 #if INCLUDE_SERVICES | 82 #if INCLUDE_SERVICES |
83 // Size Statistics | 83 // Size Statistics |
84 | 84 |