Nested namespace and =delete

1 files changed, 5 insertions, 10 deletions

diff --git a/vespalib/src/vespa/vespalib/util/slaveproc.h b/vespalib/src/vespa/vespalib/util/slaveproc.h
index 72b20cfb069..c08a13f0b1d 100644
--- a/vespalib/src/vespa/vespalib/util/slaveproc.h
+++ b/vespalib/src/vespa/vespalib/util/slaveproc.h
@@ -8,14 +8,9 @@
 #include <queue>
 #include "sync.h"
 
-namespace vespalib {
-
-namespace slaveproc {
-
-class Timer;
-
-} // namespace slaveproc
+namespace vespalib::slaveproc { class Timer; }
 
+namespace vespalib {
 /**
  * @brief Slave Process utility class for running external programs
  *
@@ -56,12 +51,12 @@ private:
     bool           _failed;
     int            _exitCode;
 
-    SlaveProc(const SlaveProc &);            // no copy
-    SlaveProc &operator=(const SlaveProc &); // no assignment
-
     void checkProc();
 
 public:
+    SlaveProc(const SlaveProc &) = delete;
+    SlaveProc &operator=(const SlaveProc &) = delete;
+    
     /**
      * @brief Run a slave process
      *