From 995cbbf879fcbd45e3a1f586589ebc11eff18a21 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Mon, 20 Mar 2006 21:24:59 +0000
Subject: [PATCH] protect SafeDelete from being defined already.
git-svn-id: http://root.cern.ch/svn/root/trunk@14329 27541ba8-7e3a-0410-8455-c3a389f83636
---
proofd/src/XrdProofConn.cxx | 4 +++-
proofd/src/XrdProofServProxy.cxx | 7 ++++---
proofd/src/XrdProofdProtocol.cxx | 4 ++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/proofd/src/XrdProofConn.cxx b/proofd/src/XrdProofConn.cxx
index 0f599ac8c92..37d20085936 100644
--- a/proofd/src/XrdProofConn.cxx
+++ b/proofd/src/XrdProofConn.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proofd:$Name: $:$Id: XrdProofConn.cxx,v 1.4 2006/03/01 15:46:33 rdm Exp $
+// @(#)root/proofd:$Name: $:$Id: XrdProofConn.cxx,v 1.5 2006/03/16 09:08:08 rdm Exp $
// Author: Gerardo Ganis 12/12/2005
/*************************************************************************
@@ -66,7 +66,9 @@ typedef XrdSecProtocol *(*XrdSecGetProt_t)(const char *, const struct sockaddr &
XrdClientConnectionMgr *XrdProofConn::fgConnMgr = 0;
+#ifndef SafeDelete
#define SafeDelete(x) { if (x) { delete x; x = 0; } }
+#endif
#define URLTAG "["<<fUrl.Host<<":"<<fUrl.Port<<"]"
//_____________________________________________________________________________
diff --git a/proofd/src/XrdProofServProxy.cxx b/proofd/src/XrdProofServProxy.cxx
index b8f438fd7b4..d89123a2bac 100644
--- a/proofd/src/XrdProofServProxy.cxx
+++ b/proofd/src/XrdProofServProxy.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proofd:$Name: $:$Id: XrdProofServProxy.cxx,v 1.2 2005/12/12 16:42:14 rdm Exp $
+// @(#)root/proofd:$Name: $:$Id: XrdProofServProxy.cxx,v 1.3 2006/03/01 15:46:12 rdm Exp $
// Author: Gerardo Ganis 12/12/2005
/*************************************************************************
@@ -23,8 +23,9 @@
extern XrdOucTrace *XrdProofdTrace;
static const char *TraceID = " ";
#define TRACEID TraceID
-
-#define SafeDelete(x) { if (x) delete x; x = 0; }
+#ifndef SafeDelete
+#define SafeDelete(x) { if (x) { delete x; x = 0; } }
+#endif
//__________________________________________________________________________
XrdProofServProxy::XrdProofServProxy()
diff --git a/proofd/src/XrdProofdProtocol.cxx b/proofd/src/XrdProofdProtocol.cxx
index 1413644e308..fa76920bfcb 100644
--- a/proofd/src/XrdProofdProtocol.cxx
+++ b/proofd/src/XrdProofdProtocol.cxx
@@ -1,4 +1,4 @@
-// @(#)root/proofd:$Name: $:$Id: XrdProofdProtocol.cxx,v 1.5 2006/03/01 15:46:12 rdm Exp $
+// @(#)root/proofd:$Name: $:$Id: XrdProofdProtocol.cxx,v 1.6 2006/03/16 16:41:59 rdm Exp $
// Author: Gerardo Ganis 12/12/2005
/*************************************************************************
@@ -117,7 +117,7 @@ XrdProofdProtocol::fgProtStack("ProtStack", "xproofd protocol anchor");
#define TRACELINK lp
#define TRACEID gTraceID
#ifndef SafeDelete
-#define SafeDelete(x) { if (x) delete x; x = 0; }
+#define SafeDelete(x) { if (x) { delete x; x = 0; } }
#endif
#define INRANGE(x,y) ((x >= 0) && (x < (int)y.size()))
--
GitLab