Skip to content

Commit 64e2c67

Browse files
committedSep 1, 2020
Merge
2 parents dc54966 + a4ab613 commit 64e2c67

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed
 

‎src/hotspot/share/gc/shenandoah/mode/shenandoahIUMode.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "gc/shenandoah/mode/shenandoahIUMode.hpp"
3232
#include "logging/log.hpp"
3333
#include "logging/logTag.hpp"
34+
#include "runtime/java.hpp"
3435

3536
void ShenandoahIUMode::initialize_flags() const {
3637
if (ShenandoahConcurrentRoots::can_do_concurrent_class_unloading()) {

‎src/hotspot/share/gc/shenandoah/mode/shenandoahSATBMode.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "gc/shenandoah/mode/shenandoahSATBMode.hpp"
3232
#include "logging/log.hpp"
3333
#include "logging/logTag.hpp"
34+
#include "runtime/java.hpp"
3435

3536
void ShenandoahSATBMode::initialize_flags() const {
3637
if (ShenandoahConcurrentRoots::can_do_concurrent_class_unloading()) {

‎src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
3030
#include "gc/shenandoah/shenandoahHeap.inline.hpp"
3131
#include "gc/shenandoah/shenandoahHeapRegion.hpp"
32+
#include "runtime/java.hpp"
3233
#include "utilities/defaultStream.hpp"
3334

3435
void ShenandoahArguments::initialize() {

‎src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
#include "runtime/atomic.hpp"
7777
#include "runtime/globals.hpp"
7878
#include "runtime/interfaceSupport.inline.hpp"
79+
#include "runtime/java.hpp"
7980
#include "runtime/orderAccess.hpp"
8081
#include "runtime/safepointMechanism.hpp"
8182
#include "runtime/vmThread.hpp"

‎src/java.base/share/classes/java/text/DecimalFormat.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,9 @@
338338
*
339339
* <h3>Example</h3>
340340
*
341-
* <blockquote><pre>{@code
342-
* <strong>// Print out a number using the localized number, integer, currency,
343-
* // and percent format for each locale</strong>
341+
* <blockquote><pre><strong>{@code
342+
* // Print out a number using the localized number, integer, currency,
343+
* // and percent format for each locale}</strong>{@code
344344
* Locale[] locales = NumberFormat.getAvailableLocales();
345345
* double myNumber = -1234.56;
346346
* NumberFormat form;

0 commit comments

Comments
 (0)
Please sign in to comment.