From 1079419a88d560dc202884f3b2045fd0b04014c8 Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Tue, 23 May 2006 07:43:55 +0000
Subject: [PATCH] Implement copy constructors and assignement operators
required following Federico's changes
git-svn-id: http://root.cern.ch/svn/root/trunk@15138 27541ba8-7e3a-0410-8455-c3a389f83636
---
proof/inc/TProofPlayer.h | 4 +++-
proof/src/TProofPlayer.cxx | 15 ++++++++++++++-
proofplayer/inc/TProofPlayer.h | 4 +++-
proofplayer/src/TProofPlayer.cxx | 15 ++++++++++++++-
proofx/inc/TXSocket.h | 4 +++-
proofx/src/TXSocket.cxx | 15 ++++++++++++++-
thread/inc/TSemaphore.h | 4 +++-
thread/src/TSemaphore.cxx | 15 ++++++++++++++-
8 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/proof/inc/TProofPlayer.h b/proof/inc/TProofPlayer.h
index 6eb3e453b16..04a6dba282f 100644
--- a/proof/inc/TProofPlayer.h
+++ b/proof/inc/TProofPlayer.h
@@ -1,4 +1,4 @@
-// @(#)root/proof:$Name: $:$Id: TProofPlayer.h,v 1.33 2005/09/24 11:33:41 rdm Exp $
+// @(#)root/proof:$Name: $:$Id: TProofPlayer.h,v 1.34 2006/05/15 09:45:03 brun Exp $
// Author: Maarten Ballintijn 07/01/02
/*************************************************************************
@@ -254,6 +254,8 @@ protected:
public:
TProofPlayerSuperMaster(TProof *proof = 0) :
TProofPlayerRemote(proof), fReturnFeedback(kFALSE) { }
+ TProofPlayerSuperMaster(const TProofPlayerSuperMaster &p);
+ TProofPlayerSuperMaster& operator=(const TProofPlayerSuperMaster& p);
virtual ~TProofPlayerSuperMaster() { }
virtual Long64_t Process(TDSet *set, const char *selector,
diff --git a/proof/src/TProofPlayer.cxx b/proof/src/TProofPlayer.cxx
index e7396a07588..9363b779925 100644
--- a/proof/src/TProofPlayer.cxx
+++ b/proof/src/TProofPlayer.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proof:$Name: $:$Id: TProofPlayer.cxx,v 1.76 2006/04/19 10:57:44 rdm Exp $
+// @(#)root/proof:$Name: $:$Id: TProofPlayer.cxx,v 1.77 2006/05/15 09:45:03 brun Exp $
// Author: Maarten Ballintijn 07/01/02
/*************************************************************************
@@ -1577,6 +1577,19 @@ Long64_t TProofPlayerSlave::DrawSelect(TDSet * /*set*/, const char * /*varexp*/,
ClassImp(TProofPlayerSuperMaster)
+//______________________________________________________________________________
+TProofPlayerSuperMaster::TProofPlayerSuperMaster(const TProofPlayerSuperMaster &p) : TProofPlayerRemote(p)
+{
+ // TProofPlayerSuperMaster copy ctor.
+}
+
+//______________________________________________________________________________
+TProofPlayerSuperMaster& TProofPlayerSuperMaster::operator=(const TProofPlayerSuperMaster&)
+{
+ // TProofPlayerSuperMaster assignment operator.
+ return *this;
+}
+
//______________________________________________________________________________
Long64_t TProofPlayerSuperMaster::Process(TDSet *dset, const char *selector_file,
Option_t *option, Long64_t nentries,
diff --git a/proofplayer/inc/TProofPlayer.h b/proofplayer/inc/TProofPlayer.h
index 6eb3e453b16..04a6dba282f 100644
--- a/proofplayer/inc/TProofPlayer.h
+++ b/proofplayer/inc/TProofPlayer.h
@@ -1,4 +1,4 @@
-// @(#)root/proof:$Name: $:$Id: TProofPlayer.h,v 1.33 2005/09/24 11:33:41 rdm Exp $
+// @(#)root/proof:$Name: $:$Id: TProofPlayer.h,v 1.34 2006/05/15 09:45:03 brun Exp $
// Author: Maarten Ballintijn 07/01/02
/*************************************************************************
@@ -254,6 +254,8 @@ protected:
public:
TProofPlayerSuperMaster(TProof *proof = 0) :
TProofPlayerRemote(proof), fReturnFeedback(kFALSE) { }
+ TProofPlayerSuperMaster(const TProofPlayerSuperMaster &p);
+ TProofPlayerSuperMaster& operator=(const TProofPlayerSuperMaster& p);
virtual ~TProofPlayerSuperMaster() { }
virtual Long64_t Process(TDSet *set, const char *selector,
diff --git a/proofplayer/src/TProofPlayer.cxx b/proofplayer/src/TProofPlayer.cxx
index e7396a07588..9363b779925 100644
--- a/proofplayer/src/TProofPlayer.cxx
+++ b/proofplayer/src/TProofPlayer.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proof:$Name: $:$Id: TProofPlayer.cxx,v 1.76 2006/04/19 10:57:44 rdm Exp $
+// @(#)root/proof:$Name: $:$Id: TProofPlayer.cxx,v 1.77 2006/05/15 09:45:03 brun Exp $
// Author: Maarten Ballintijn 07/01/02
/*************************************************************************
@@ -1577,6 +1577,19 @@ Long64_t TProofPlayerSlave::DrawSelect(TDSet * /*set*/, const char * /*varexp*/,
ClassImp(TProofPlayerSuperMaster)
+//______________________________________________________________________________
+TProofPlayerSuperMaster::TProofPlayerSuperMaster(const TProofPlayerSuperMaster &p) : TProofPlayerRemote(p)
+{
+ // TProofPlayerSuperMaster copy ctor.
+}
+
+//______________________________________________________________________________
+TProofPlayerSuperMaster& TProofPlayerSuperMaster::operator=(const TProofPlayerSuperMaster&)
+{
+ // TProofPlayerSuperMaster assignment operator.
+ return *this;
+}
+
//______________________________________________________________________________
Long64_t TProofPlayerSuperMaster::Process(TDSet *dset, const char *selector_file,
Option_t *option, Long64_t nentries,
diff --git a/proofx/inc/TXSocket.h b/proofx/inc/TXSocket.h
index 5a74ecf029e..3a53a460b51 100644
--- a/proofx/inc/TXSocket.h
+++ b/proofx/inc/TXSocket.h
@@ -1,4 +1,4 @@
-// @(#)root/proofx:$Name: $:$Id: TXSocket.h,v 1.2 2006/02/26 16:09:57 rdm Exp $
+// @(#)root/proofx:$Name: $:$Id: TXSocket.h,v 1.3 2006/04/19 10:57:44 rdm Exp $
// Author: G. Ganis Oct 2005
/*************************************************************************
@@ -128,6 +128,8 @@ public:
TXSocket(const char *url,
Char_t mode = 'M', Int_t psid = -1, Char_t ver = -1, const char *alias = 0);
+ TXSocket(const TXSocket &xs);
+ TXSocket& operator=(const TXSocket& xs);
virtual ~TXSocket();
virtual void Close(Option_t *opt = "");
diff --git a/proofx/src/TXSocket.cxx b/proofx/src/TXSocket.cxx
index 3e64a7ebed9..a640d6bbd50 100644
--- a/proofx/src/TXSocket.cxx
+++ b/proofx/src/TXSocket.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proofx:$Name: $:$Id: TXSocket.cxx,v 1.8 2006/04/18 10:34:35 rdm Exp $
+// @(#)root/proofx:$Name: $:$Id: TXSocket.cxx,v 1.9 2006/04/19 10:57:44 rdm Exp $
// Author: Gerardo Ganis 12/12/2005
/*************************************************************************
@@ -209,6 +209,19 @@ TXSocket::TXSocket(const char *url,
}
}
+//______________________________________________________________________________
+TXSocket::TXSocket(const TXSocket &s) : TSocket(s),XrdClientAbsUnsolMsgHandler(s)
+{
+ // TXSocket copy ctor.
+}
+
+//______________________________________________________________________________
+TXSocket& TXSocket::operator=(const TXSocket&)
+{
+ // TXSocket assignment operator.
+ return *this;
+}
+
//_____________________________________________________________________________
TXSocket::~TXSocket()
{
diff --git a/thread/inc/TSemaphore.h b/thread/inc/TSemaphore.h
index ba829685573..4f7ccc7f12c 100644
--- a/thread/inc/TSemaphore.h
+++ b/thread/inc/TSemaphore.h
@@ -1,4 +1,4 @@
-// @(#)root/thread:$Name: $:$Id: TSemaphore.h,v 1.2 2004/12/10 12:13:33 rdm Exp $
+// @(#)root/thread:$Name: $:$Id: TSemaphore.h,v 1.3 2005/12/09 15:12:19 rdm Exp $
// Author: Fons Rademakers 02/07/97
/*************************************************************************
@@ -42,6 +42,8 @@ private:
public:
TSemaphore(UInt_t initial = 1);
+ TSemaphore(const TSemaphore &s);
+ TSemaphore& operator=(const TSemaphore& s);
virtual ~TSemaphore() { }
Int_t Wait(Int_t millisec = 0);
diff --git a/thread/src/TSemaphore.cxx b/thread/src/TSemaphore.cxx
index c74ae6689bb..82464935bea 100644
--- a/thread/src/TSemaphore.cxx
+++ b/thread/src/TSemaphore.cxx
@@ -1,4 +1,4 @@
-// @(#)root/thread:$Name: $:$Id: TSemaphore.cxx,v 1.2 2004/12/10 12:13:33 rdm Exp $
+// @(#)root/thread:$Name: $:$Id: TSemaphore.cxx,v 1.3 2005/12/09 15:12:19 rdm Exp $
// Author: Fons Rademakers 02/07/97
/*************************************************************************
@@ -30,6 +30,19 @@ TSemaphore::TSemaphore(UInt_t initial) : fCond(&fMutex)
fValue = initial;
}
+//______________________________________________________________________________
+TSemaphore::TSemaphore(const TSemaphore &s) : TObject(s)
+{
+ // TSemaphore copy ctor.
+}
+
+//______________________________________________________________________________
+TSemaphore& TSemaphore::operator=(const TSemaphore&)
+{
+ // TSemaphore assignment operator.
+ return *this;
+}
+
//______________________________________________________________________________
Int_t TSemaphore::Wait(Int_t millisec)
{
--
GitLab