[Libreoffice-commits] online.git: loolwsd/DocumentBroker.hpp

[Ashod Nakashian]

 loolwsd/DocumentBroker.hpp |   25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

New commits:
commit 3dc72cab18a5fdc3b623dc18740e5143d40c7618
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun May 1 20:30:52 2016 -0400

    loolwsd: ChildProcess cleanup
    
    Change-Id: I1ae4911d3f5d527af86f39ed2723bbceef12cffe
    Reviewed-on: https://gerrit.libreoffice.org/24577
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/DocumentBroker.hpp b/loolwsd/DocumentBroker.hpp
index 9bf290b..965ced3 100644
--- a/loolwsd/DocumentBroker.hpp
+++ b/loolwsd/DocumentBroker.hpp
@@ -35,11 +35,6 @@ class TileCache;
 class ChildProcess
 {
 public:
-    ChildProcess() :
-        _pid(-1)
-    {
-    }
-
     /// @param pid is the process ID of the child.
     /// @param ws is the control WebSocket to the child.
     ChildProcess(const Poco::Process::PID pid, const std::shared_ptr<Poco::Net::WebSocket>& ws) :
@@ -49,25 +44,9 @@ public:
         Log::info("ChildProcess ctor [" + std::to_string(_pid) + "].");
     }
 
-    ChildProcess(ChildProcess&& other) :
-        _pid(other._pid),
-        _ws(other._ws)
-    {
-        Log::info("ChildProcess move ctor [" + std::to_string(_pid) + "].");
-        other._pid = -1;
-        other._ws.reset();
-    }
-
-    const ChildProcess& operator=(ChildProcess&& other)
-    {
-        Log::info("ChildProcess assign [" + std::to_string(_pid) + "].");
-        _pid = other._pid;
-        other._pid = -1;
-        _ws = other._ws;
-        other._ws.reset();
+    ChildProcess(ChildProcess&& other) = delete;
 
-        return *this;
-    }
+    const ChildProcess& operator=(ChildProcess&& other) = delete;
 
     ~ChildProcess()
     {