Merge

Mon, 03 Dec 2018 14:07:45 +0000

author
kevinw
date
Mon, 03 Dec 2018 14:07:45 +0000
changeset 9598
d7bcbcfde505
parent 9596
79920693f915
parent 9597
26f9044e381f
child 9599
1485461a0fd1

Merge

     1.1 --- a/src/share/vm/memory/metaspace.hpp	Mon Dec 03 07:29:54 2018 -0500
     1.2 +++ b/src/share/vm/memory/metaspace.hpp	Mon Dec 03 14:07:45 2018 +0000
     1.3 @@ -259,7 +259,7 @@
     1.4    // Debugging support
     1.5    void verify();
     1.6  
     1.7 -  static void print_compressed_class_space(outputStream* st, const char* requested_addr = 0);
     1.8 +  static void print_compressed_class_space(outputStream* st, const char* requested_addr = 0) NOT_LP64({});
     1.9  
    1.10    class AllocRecordClosure :  public StackObj {
    1.11    public:

mercurial