Skip to content
Permalink
Browse files
Automatic merge of jdk:master into master
  • Loading branch information
duke committed Jun 7, 2021
2 parents 974df31 + b09d8b9 commit 44b65eb0b36e42d74db68b93a56a2c50abc6e06f
Showing 2 changed files with 2 additions and 3 deletions.
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021, 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
@@ -43,7 +43,7 @@ class LogDecorations {
LogLevelType _level; // for "level" (needs to be nonconst)
const LogTagSet& _tagset; // for "tags"
// In debug mode we keep the decorators around for sanity checking when printing
DEBUG_ONLY(const LogDecorators& _decorators;)
DEBUG_ONLY(const LogDecorators _decorators;)

static const char* volatile _host_name;
static const char* host_name();
@@ -88,7 +88,6 @@ gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 8241293 macosx-x64

# :hotspot_runtime

gtest/AsyncLogGtest.java 8267926 generic-all
runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java 8253437 windows-x64
runtime/cds/DeterministicDump.java 8253495 generic-all
runtime/jni/terminatedThread/TestTerminatedThread.java 8219652 aix-ppc64

0 comments on commit 44b65eb

Please sign in to comment.