2 files changed, 6 insertions, 7 deletions
diff --git a/vespalib/src/vespa/vespalib/util/signalhandler.cpp b/vespalib/src/vespa/vespalib/util/signalhandler.cpp
index f16ef55fc30..c0456ca9cef 100644
--- a/vespalib/src/vespa/vespalib/util/signalhandler.cpp
+++ b/vespalib/src/vespa/vespalib/util/signalhandler.cpp
@@ -12,8 +12,7 @@ namespace {
 class Shutdown
 {
 public:
-    ~Shutdown(void)
-    {
+    ~Shutdown() {
         SignalHandler::shutdown();
     }
 };
@@ -106,7 +105,7 @@ SignalHandler::unhook()
 
 
 void
-SignalHandler::shutdown(void)
+SignalHandler::shutdown()
 {
     for (std::vector<SignalHandler*>::iterator
              it = _handlers.begin(), ite = _handlers.end();
diff --git a/vespalib/src/vespa/vespalib/util/signalhandler.h b/vespalib/src/vespa/vespalib/util/signalhandler.h
index 3ac7926531f..a5a474bb471 100644
--- a/vespalib/src/vespa/vespalib/util/signalhandler.h
+++ b/vespalib/src/vespa/vespalib/util/signalhandler.h
@@ -59,8 +59,9 @@ private:
      * initialization.
      **/
     SignalHandler(int signal);
-    SignalHandler(const SignalHandler &); // not defined
-    SignalHandler &operator=(const SignalHandler &); // not defined
+
+    SignalHandler(const SignalHandler &) = delete;
+    SignalHandler &operator=(const SignalHandler &) = delete;
 
 public:
     static SignalHandler HUP;
@@ -103,8 +104,7 @@ public:
      **/
     void unhook();
 
-    static void
-    shutdown(void);
+    static void shutdown();
 };
 
 } // vespalib