Mercurial > hg > truffle
comparison src/share/vm/libadt/dict.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 | f95d63e2154a |
children |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1997, 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. |
35 // #include "port.hpp" | 35 // #include "port.hpp" |
36 //IMPLEMENTATION | 36 //IMPLEMENTATION |
37 // #include "dict.hpp" | 37 // #include "dict.hpp" |
38 | 38 |
39 #include <assert.h> | 39 #include <assert.h> |
40 | |
41 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
40 | 42 |
41 // The iostream is not needed and it gets confused for gcc by the | 43 // The iostream is not needed and it gets confused for gcc by the |
42 // define of bool. | 44 // define of bool. |
43 // | 45 // |
44 // #include <iostream.h> | 46 // #include <iostream.h> |