--- old/src/hotspot/share/services/diagnosticArgument.cpp	2018-06-15 19:19:47.291000112 +0200
+++ new/src/hotspot/share/services/diagnosticArgument.cpp	2018-06-15 19:19:47.190999221 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
--- old/src/hotspot/share/services/diagnosticArgument.hpp	2018-06-15 19:19:47.643003249 +0200
+++ new/src/hotspot/share/services/diagnosticArgument.hpp	2018-06-15 19:19:47.543002358 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -71,15 +71,9 @@
   bool             _allow_multiple;
   GenDCmdArgument(const char* name, const char* description, const char* type,
                   const char* default_string, bool mandatory)
-    : _next(NULL)
-    , _name(name)
-    , _description(description)
-    , _type(type)
-    , _default_string(default_string)
-    , _is_set(false)
-    , _is_mandatory(mandatory)
-    ,  _allow_multiple(false) {}
-
+    : _next(NULL), _name(name), _description(description), _type(type),
+      _default_string(default_string), _is_set(false), _is_mandatory(mandatory),
+      _allow_multiple(false) {}
 public:
   const char* name() const        { return _name; }
   const char* description() const { return _description; }
--- old/src/hotspot/share/services/diagnosticFramework.cpp	2018-06-15 19:19:47.987006315 +0200
+++ new/src/hotspot/share/services/diagnosticFramework.cpp	2018-06-15 19:19:47.887005424 +0200
@@ -35,10 +35,7 @@
 #include "services/management.hpp"
 
 CmdLine::CmdLine(const char* line, size_t len, bool no_command_name)
-  : _cmd(NULL)
-  , _cmd_len(0)
-  , _args(NULL)
-  , _args_len(0)
+  : _cmd(line), _cmd_len(0), _args(NULL), _args_len(0)
 {
   assert(line != NULL, "Command line string should not be NULL");
   const char* line_end;
--- old/src/hotspot/share/services/diagnosticFramework.hpp	2018-06-15 19:19:48.335009416 +0200
+++ new/src/hotspot/share/services/diagnosticFramework.hpp	2018-06-15 19:19:48.235008525 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -82,10 +82,8 @@
 public:
 
   DCmdIter(const char* str, char delim)
-   : _str(str)
-   , _delim(delim)
-   , _len(::strlen(str))
-   , _cursor(0) {}
+   : _str(str), _delim(delim), _len(::strlen(str)),
+     _cursor(0) {}
   bool has_next() const { return _cursor < _len; }
   CmdLine next() {
     assert(_cursor <= _len, "Cannot iterate more");
@@ -111,15 +109,8 @@
   const char  _delim;
 public:
   DCmdArgIter(const char* buf, size_t len, char delim)
-    : _buffer(buf)
-    , _len(len)
-    , _cursor(0)
-    , _key_addr(NULL)
-    , _key_len(0)
-    , _value_addr(NULL)
-    , _value_len(0)
-    , _delim(delim)
-  {}
+    : _buffer(buf), _len(len), _cursor(0), _key_addr(NULL),
+      _key_len(0), _value_addr(NULL), _value_len(0), _delim(delim) {}
 
   bool next(TRAPS);
   const char* key_addr() const    { return _key_addr; }
@@ -145,12 +136,8 @@
           JavaPermission permission,
           int num_arguments,
           bool enabled)
-  : _name(name)
-  , _description(description)
-  , _impact(impact)
-  , _permission(permission)
-  , _num_arguments(num_arguments)
-  , _is_enabled(enabled) {}
+  : _name(name), _description(description), _impact(impact), _permission(permission),
+    _num_arguments(num_arguments), _is_enabled(enabled) {}
   const char* name() const          { return _name; }
   const char* description() const   { return _description; }
   const char* impact() const        { return _impact; }
@@ -180,14 +167,9 @@
   DCmdArgumentInfo(const char* name, const char* description, const char* type,
                    const char* default_string, bool mandatory, bool option,
                    bool multiple, int position = -1)
-    : _name(name)
-    , _description(description)
-    , _type(type)
-    , _default_string(default_string)
-    , _mandatory(mandatory)
-    , _option(option)
-    , _multiple(multiple)
-    , _position(position) {}
+    : _name(name), _description(description), _type(type),
+      _default_string(default_string), _mandatory(mandatory), _option(option),
+      _multiple(multiple), _position(position) {}
 
   const char* name() const        { return _name; }
   const char* description() const { return _description; }
@@ -224,8 +206,7 @@
   GenDCmdArgument* _arguments_list;
 public:
   DCmdParser()
-    : _options(NULL)
-    , _arguments_list(NULL) {}
+    : _options(NULL), _arguments_list(NULL) {}
   void add_dcmd_option(GenDCmdArgument* arg);
   void add_dcmd_argument(GenDCmdArgument* arg);
   GenDCmdArgument* lookup_dcmd_option(const char* name, size_t len);
@@ -260,8 +241,7 @@
   const bool          _is_heap_allocated;
 public:
   DCmd(outputStream* output, bool heap_allocated)
-   : _output(output)
-   , _is_heap_allocated(heap_allocated) {}
+   : _output(output), _is_heap_allocated(heap_allocated) {}
 
   // Child classes: please always provide these methods:
   //  static const char* name()             { return "<command name>";}
@@ -384,11 +364,8 @@
 
 public:
   DCmdFactory(int num_arguments, uint32_t flags, bool enabled, bool hidden)
-    : _next(NULL)
-    , _enabled(enabled)
-    , _hidden(hidden)
-    , _export_flags(flags)
-    , _num_arguments(num_arguments) {}
+    : _next(NULL), _enabled(enabled), _hidden(hidden),
+      _export_flags(flags), _num_arguments(num_arguments) {}
   bool is_enabled() const       { return _enabled; }
   bool is_hidden() const        { return _hidden; }
   uint32_t export_flags() const { return _export_flags; }