diff options
| author | drchase <none@none> | 2014-05-22 15:52:41 -0400 |
|---|---|---|
| committer | drchase <none@none> | 2014-05-22 15:52:41 -0400 |
| commit | a2023a26c5a025b32fc29f0370e12356837dfe2a (patch) | |
| tree | 3a4b14865e127e75980cb481af722dcabde2453b /src/share/vm/libadt | |
| parent | 37cee6e8fedca75acdd8febe55152a502bc8de09 (diff) | |
| download | jdk8u_hotspot-a2023a26c5a025b32fc29f0370e12356837dfe2a.tar.gz | |
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
Diffstat (limited to 'src/share/vm/libadt')
| -rw-r--r-- | src/share/vm/libadt/dict.cpp | 4 | ||||
| -rw-r--r-- | src/share/vm/libadt/set.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/share/vm/libadt/dict.cpp b/src/share/vm/libadt/dict.cpp index 29c16bb41..37559a097 100644 --- a/src/share/vm/libadt/dict.cpp +++ b/src/share/vm/libadt/dict.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,6 +38,8 @@ #include <assert.h> +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC + // The iostream is not needed and it gets confused for gcc by the // define of bool. // diff --git a/src/share/vm/libadt/set.cpp b/src/share/vm/libadt/set.cpp index 7364795ed..f91acd80c 100644 --- a/src/share/vm/libadt/set.cpp +++ b/src/share/vm/libadt/set.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -116,7 +116,7 @@ char *Set::setstr() const void Set::print() const { char *printable_set = setstr(); - tty->print_cr(printable_set); + tty->print_cr("%s", printable_set); FreeHeap(printable_set); } |