Need a volunteer to push C++11 macro fix to jdk9/hs-rt (original) (raw)

bill pittore bill.pittore at oracle.com
Wed Jun 24 21:00:18 UTC 2015


No problem. I'm sure there are a few more I missed since I only built linux and windows with the C++11 standard.

bill

On 6/24/2015 4:46 PM, Gerard Ziemski wrote:

Thank you Bill for fixing this.

I had this fix in my local repo, but it has more changes, so it's taking me longer and you beat me to it.

cheers On 6/24/2015 10:50 AM, bill pittore wrote: This is bug 8081202 which fixes "C++11 requires a space between literal and identifier"

There are two export files here: /export/users/bpittore/jdk9-macro-2/8081202.hotspot.export /export/users/bpittore/jdk9-macro-2/8081202.hotspot.closed.export The parent repo is jdk9/hs-rt. I made some new changes to two files during the merge of the files from the command line range checking changeset. Diffs are below. Thanks! bill --- old/src/share/vm/runtime/globals.cpp 2015-06-24 11:23:48.142216822 -0400 +++ new/src/share/vm/runtime/globals.cpp 2015-06-24 11:23:47.514180257 -0400 @@ -1240,7 +1240,7 @@ sizeranges += sizeof(CommandLineFlagRange*); } } - fprintf(stderr, "Size of %d ranges: "SIZEFORMAT" bytes\n", + fprintf(stderr, "Size of %d ranges: " SIZEFORMAT " bytes\n", CommandLineFlagRangeList::length(), sizeranges); } { @@ -1270,7 +1270,7 @@ sizeconstraints += sizeof(CommandLineFlagConstraint*); } } - fprintf(stderr, "Size of %d constraints: "SIZEFORMAT" bytes\n", + fprintf(stderr, "Size of %d constraints: " SIZEFORMAT " bytes\n", CommandLineFlagConstraintList::length(), sizeconstraints); } #endif // PRINTRANGESANDCONSTRAINTSSIZES --- old/src/share/vm/runtime/commandLineFlagRangeList.cpp 2015-06-24 11:23:50.034326981 -0400 +++ new/src/share/vm/runtime/commandLineFlagRangeList.cpp 2015-06-24 11:23:49.462293677 -0400 @@ -84,7 +84,7 @@ } void print(outputStream* st) { - st->print("[ "INTXFORMATW(-25)" ... "INTXFORMATW(25)" ]", min, max); + st->print("[ " INTXFORMATW(-25) " ... " INTXFORMATW(25) " ]", min, max); } }; @@ -140,7 +140,7 @@ } void print(outputStream* st) { - st->print("[ "UINTXFORMATW(-25)" ... "UINTXFORMATW(25)" ]", min, max); + st->print("[ " UINTXFORMATW(-25) " ... " UINTXFORMATW(25) " ]", min, max); } }; @@ -196,7 +196,7 @@ } void print(outputStream* st) { - st->print("[ "SIZEFORMATW(-25)" ... "SIZEFORMATW(25)" ]", min, max); + st->print("[ " SIZEFORMATW(-25) " ... " SIZEFORMATW(25) " ]", min, max); } };



More information about the hotspot-dev mailing list